diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-02-13 19:37:25 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-02-14 11:37:01 +0100 |
| commit | c3b57d6e76cd3df87652639405505b7de5746ca8 (patch) | |
| tree | f96961335199f7f2e6d5ed9d9f158ad3c13386b2 /libavformat/allformats.c | |
| parent | df6050188c5bfa4dd7eed62a662506187810249b (diff) | |
| download | ffmpeg-c3b57d6e76cd3df87652639405505b7de5746ca8.tar.gz | |
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.
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 15 |
1 files changed, 8 insertions, 7 deletions
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); } |