From c3b57d6e76cd3df87652639405505b7de5746ca8 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 13 Feb 2012 19:37:25 +0100 Subject: librtmp: Add "lib" prefix to librtmp URLProtocol declarations. This allows easily differentiating between both implementations within the build system and combining the native implementation for plain RTMP with librtmp for the RTMPE, RTMPS, RTMPT, RTMPTE protocol variants. --- libavformat/allformats.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'libavformat/allformats.c') diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 9a1f94d13a..9a559936f8 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -237,9 +237,6 @@ void av_register_all(void) REGISTER_DEMUXER (YOP, yop); REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe); - /* external libraries */ - REGISTER_MUXDEMUX (LIBNUT, libnut); - /* protocols */ REGISTER_PROTOCOL (APPLEHTTP, applehttp); REGISTER_PROTOCOL (CONCAT, concat); @@ -254,12 +251,16 @@ void av_register_all(void) REGISTER_PROTOCOL (MD5, md5); REGISTER_PROTOCOL (PIPE, pipe); REGISTER_PROTOCOL (RTMP, rtmp); - REGISTER_PROTOCOL (RTMPE, rtmpe); - REGISTER_PROTOCOL (RTMPS, rtmps); - REGISTER_PROTOCOL (RTMPT, rtmpt); - REGISTER_PROTOCOL (RTMPTE, rtmpte); REGISTER_PROTOCOL (RTP, rtp); REGISTER_PROTOCOL (TCP, tcp); REGISTER_PROTOCOL (TLS, tls); REGISTER_PROTOCOL (UDP, udp); + + /* external libraries */ + REGISTER_MUXDEMUX (LIBNUT, libnut); + REGISTER_PROTOCOL (LIBRTMP, librtmp); + REGISTER_PROTOCOL (LIBRTMPE, librtmpe); + REGISTER_PROTOCOL (LIBRTMPS, librtmps); + REGISTER_PROTOCOL (LIBRTMPT, librtmpt); + REGISTER_PROTOCOL (LIBRTMPTE, librtmpte); } -- cgit v1.2.3