This allows compiling-in both native and librtmp RTMP protocols.
librtmp is preferred if both implementations are available.
---
libavformat/Makefile | 8 ++------
libavformat/allformats.c | 19 ++++++++++---------
libavformat/librtmp.c | 10 +++++-----
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0d6cb91..a465b2f 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 66a8cfe..fd5715a 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,14 +251,18 @@ void av_register_all(void)
REGISTER_PROTOCOL (MD5, md5);
REGISTER_PROTOCOL (PIPE, pipe);
REGISTER_PROTOCOL (RTMP, rtmp);
-#if CONFIG_LIBRTMP
- REGISTER_PROTOCOL (RTMP, rtmpt);
- REGISTER_PROTOCOL (RTMP, rtmpe);
- REGISTER_PROTOCOL (RTMP, rtmpte);
- REGISTER_PROTOCOL (RTMP, rtmps);
-#endif
REGISTER_PROTOCOL (RTP, rtp);
REGISTER_PROTOCOL (TCP, tcp);
REGISTER_PROTOCOL (TLS, tls);
REGISTER_PROTOCOL (UDP, udp);
+
+ /* external libraries */
+ REGISTER_MUXDEMUX (LIBNUT, libnut);
+#if CONFIG_LIBRTMP
+ REGISTER_PROTOCOL (LIBRTMP, librtmp);
+ REGISTER_PROTOCOL (LIBRTMPE, librtmpe);
+ REGISTER_PROTOCOL (LIBRTMPS, librtmps);
+ REGISTER_PROTOCOL (LIBRTMPT, librtmpt);
+ REGISTER_PROTOCOL (LIBRTMPTE, librtmpte);
+#endif
}
diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c
index 2d028b0..8883bbc 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,
--
1.7.2.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
