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 | |
| 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')
| -rw-r--r-- | libavformat/Makefile | 8 | ||||
| -rw-r--r-- | libavformat/allformats.c | 15 | ||||
| -rw-r--r-- | libavformat/librtmp.c | 10 |
3 files changed, 15 insertions, 18 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 0d6cb91e49..a465b2f44e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -323,6 +323,7 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o # external libraries OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o +OBJS-$(CONFIG_LIBRTMP) += librtmp.o # protocols I/O OBJS+= avio.o aviobuf.o @@ -339,12 +340,7 @@ OBJS-$(CONFIG_MMSH_PROTOCOL) += mmsh.o mms.o asf.o OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o asf.o OBJS-$(CONFIG_MD5_PROTOCOL) += md5proto.o OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o - -# external or internal rtmp -RTMP-OBJS-$(CONFIG_LIBRTMP) = librtmp.o -RTMP-OBJS-$(!CONFIG_LIBRTMP) = rtmpproto.o rtmppkt.o -OBJS-$(CONFIG_RTMP_PROTOCOL) += $(RTMP-OBJS-yes) - +OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o 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); } diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c index 2d028b05e2..8883bbc65f 100644 --- a/libavformat/librtmp.c +++ b/libavformat/librtmp.c @@ -152,7 +152,7 @@ static int rtmp_get_file_handle(URLContext *s) return RTMP_Socket(r); } -URLProtocol ff_rtmp_protocol = { +URLProtocol ff_librtmp_protocol = { .name = "rtmp", .url_open = rtmp_open, .url_read = rtmp_read, @@ -165,7 +165,7 @@ URLProtocol ff_rtmp_protocol = { .flags = URL_PROTOCOL_FLAG_NETWORK, }; -URLProtocol ff_rtmpt_protocol = { +URLProtocol ff_librtmpt_protocol = { .name = "rtmpt", .url_open = rtmp_open, .url_read = rtmp_read, @@ -178,7 +178,7 @@ URLProtocol ff_rtmpt_protocol = { .flags = URL_PROTOCOL_FLAG_NETWORK, }; -URLProtocol ff_rtmpe_protocol = { +URLProtocol ff_librtmpe_protocol = { .name = "rtmpe", .url_open = rtmp_open, .url_read = rtmp_read, @@ -191,7 +191,7 @@ URLProtocol ff_rtmpe_protocol = { .flags = URL_PROTOCOL_FLAG_NETWORK, }; -URLProtocol ff_rtmpte_protocol = { +URLProtocol ff_librtmpte_protocol = { .name = "rtmpte", .url_open = rtmp_open, .url_read = rtmp_read, @@ -204,7 +204,7 @@ URLProtocol ff_rtmpte_protocol = { .flags = URL_PROTOCOL_FLAG_NETWORK, }; -URLProtocol ff_rtmps_protocol = { +URLProtocol ff_librtmps_protocol = { .name = "rtmps", .url_open = rtmp_open, .url_read = rtmp_read, |