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/librtmp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavformat/librtmp.c') 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, -- cgit v1.2.3