RTMP: totally broken, disabled for the time being

diff --git a/NEWS b/NEWS
index ab7fc854c32bb0e6ba7f9a9ebb448eddf9ef1d93..f3d8af10a9ef59cbba06c9055e752990d3d0b21e 100644 (file)
--- 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 061f2b4542fd7e66af9873dbc7bf2d2caf73ff28..8cf53eac26f9985b051fab62ab5812a37c6e7a4f 100644 (file)
--- 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 b52269e8d895c7a7db462ae5b364bcaeef599cd0..a639221c4560380f1b5249864548c3d4ebff0e48 100644 (file)
--- 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 2163d753cf572b8b3478999dca5721f63886ce80..de6c5b5734f943b45f3c93017a9da20e781e18a2 100644 (file)
--- 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)