This new prefix is used in order to make the concept of internal
protocols as abstraction layer a bit nicer.
---
configure | 6 +++---
libavformat/Makefile | 2 +-
libavformat/allformats.c | 2 +-
libavformat/rtmphttp.c | 4 ++--
libavformat/rtmpproto.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 4973b1b..f540bb7 100755
--- a/configure
+++ b/configure
@@ -1542,10 +1542,10 @@ mmsh_protocol_select="http_protocol"
mmst_protocol_deps="network"
rtmp_protocol_deps="!librtmp_protocol"
rtmp_protocol_select="tcp_protocol"
-rtmphttp_protocol_deps="!librtmp_protocol"
-rtmphttp_protocol_select="http_protocol"
+ffrtmphttp_protocol_deps="!librtmp_protocol"
+ffrtmphttp_protocol_select="http_protocol"
rtmpt_protocol_deps="!librtmp_protocol"
-rtmpt_protocol_select="rtmphttp_protocol"
+rtmpt_protocol_select="ffrtmphttp_protocol"
rtp_protocol_select="udp_protocol"
sctp_protocol_deps="network netinet_sctp_h"
tcp_protocol_deps="network"
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 40f5371..c55074a 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -351,7 +351,7 @@ OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o
asf.o
OBJS-$(CONFIG_MD5_PROTOCOL) += md5proto.o
OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o
OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o
-OBJS-$(CONFIG_RTMPHTTP_PROTOCOL) += rtmphttp.o
+OBJS-$(CONFIG_FFRTMPHTTP_PROTOCOL) += rtmphttp.o
OBJS-$(CONFIG_RTMPT_PROTOCOL) += rtmpproto.o rtmppkt.o
OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o
OBJS-$(CONFIG_SCTP_PROTOCOL) += sctp.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 8456398..96af9d1 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -257,7 +257,7 @@ void av_register_all(void)
REGISTER_PROTOCOL (MD5, md5);
REGISTER_PROTOCOL (PIPE, pipe);
REGISTER_PROTOCOL (RTMP, rtmp);
- REGISTER_PROTOCOL (RTMPHTTP, rtmphttp);
+ REGISTER_PROTOCOL (FFRTMPHTTP, ffrtmphttp);
REGISTER_PROTOCOL (RTMPT, rtmpt);
REGISTER_PROTOCOL (RTP, rtp);
REGISTER_PROTOCOL (SCTP, sctp);
diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c
index 499341a..febe4b3 100644
--- a/libavformat/rtmphttp.c
+++ b/libavformat/rtmphttp.c
@@ -240,8 +240,8 @@ fail:
return ret;
}
-URLProtocol ff_rtmphttp_protocol = {
- .name = "rtmphttp",
+URLProtocol ff_ffrtmphttp_protocol = {
+ .name = "ffrtmphttp",
.url_open = rtmp_http_open,
.url_read = rtmp_http_read,
.url_write = rtmp_http_write,
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index b48274b..a2bab88 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -1116,7 +1116,7 @@ static int rtmp_open(URLContext *s, const char *uri, int
flags)
if (!strcmp(proto, "rtmpt")) {
/* open the http tunneling connection */
- ff_url_join(buf, sizeof(buf), "rtmphttp", NULL, hostname, port, NULL);
+ ff_url_join(buf, sizeof(buf), "ffrtmphttp", NULL, hostname, port,
NULL);
} else {
/* open the tcp connection */
if (port < 0)
--
1.7.11.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
