From 7de52220ab987028857939fb16cdbff69c3e5270 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 7 Mar 2010 21:26:56 +0200 Subject: [PATCH] RTMP: totally broken, disabled for the time being --- 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 ab7fc854c3..f3d8af10a9 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 061f2b4542..8cf53eac26 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 b52269e8d8..a639221c45 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 2163d753cf..de6c5b5734 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) -- 2.39.2