[vlc-commits] commit: RTMP: totally broken, disabled for the time being ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar  7 21:26:56 2010 +0200| [7de52220ab987028857939fb16cdbff69c3e5270] | committer: Rémi Denis-Courmont 

RTMP: totally broken, disabled for the time being

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7de52220ab987028857939fb16cdbff69c3e5270
---

 NEWS                               |    1 +
 modules/access/Modules.am          |    5 +++--
 modules/access/rtmp/rtmp_amf_flv.c |    1 +
 modules/access_output/Modules.am   |    2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index ab7fc85..f3d8af1 100644
--- a/NEWS
+++ b/NEWS
@@ -142,6 +142,7 @@ Removed modules:
  * cmml and tarkin codecs are removed because they are dead codecs.
  * realaudio codecs are removed in favor of libavcodec
  * access_file removed in favor of filesystem
+ * RTMP input and output
 
 
 Changes between 1.0.4 and 1.0.5:
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 061f2b4..8cf53ea 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -71,7 +71,6 @@ libvlc_LTLIBRARIES += \
 	libaccess_http_plugin.la \
 	libaccess_ftp_plugin.la \
 	libaccess_fake_plugin.la \
-	libaccess_rtmp_plugin.la \
 	libaccess_imem_plugin.la \
 	libaccess_attachment_plugin.la \
 	$(NULL)
@@ -82,5 +81,7 @@ libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
 libxcb_screen_plugin_la_LIBADD = $(AM_LIBADD) \
 	$(XCB_LIBS)
 libxcb_screen_plugin_la_DEPENDENCIES =
-EXTRA_LTLIBRARIES += libxcb_screen_plugin.la
+EXTRA_LTLIBRARIES += \
+	libaccess_rtmp_plugin.la \
+	libxcb_screen_plugin.la
 libvlc_LTLIBRARIES += $(LTLIBxcb_screen)
diff --git a/modules/access/rtmp/rtmp_amf_flv.c b/modules/access/rtmp/rtmp_amf_flv.c
index b52269e..a639221 100644
--- a/modules/access/rtmp/rtmp_amf_flv.c
+++ b/modules/access/rtmp/rtmp_amf_flv.c
@@ -2196,6 +2196,7 @@ amf_decode_string( uint8_t **buffer )
     length = ntoh16( *(uint16_t *) *buffer );
     *buffer += sizeof( uint16_t );
 
+#error This size is wrong and breaks just about everything.
     if( length > sizeof( *buffer ) / sizeof( uint8_t ))
         return NULL;
 
diff --git a/modules/access_output/Modules.am b/modules/access_output/Modules.am
index 2163d75..de6c5b5 100644
--- a/modules/access_output/Modules.am
+++ b/modules/access_output/Modules.am
@@ -18,5 +18,7 @@ libvlc_LTLIBRARIES += \
 	libaccess_output_file_plugin.la \
 	libaccess_output_udp_plugin.la \
 	libaccess_output_http_plugin.la \
+	$(NULL)
+EXTRA_LTLIBRARIES += \
 	libaccess_output_rtmp_plugin.la \
 	$(NULL)