diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:50:39 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:51:10 +0000 |
commit | 9c75148e6ebc88a0501e3d0242defb6dbdc3c23d (patch) | |
tree | e24939addbed549191606f8b6927b29b42c18394 /libavformat/allformats.c | |
parent | e3461197b1ffa0b4ebb80ee3d8567d3b286d7fc3 (diff) | |
parent | 2758cdedfb7ac61f8b5e4861f99218b6fd43491d (diff) |
Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'
This commit also disables the async fate test, because it
used internal APIs in a non-kosher way, which no longer
exists.
* commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d':
lavf: reorganize URLProtocols
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/allformats.c')
-rw-r--r-- | libavformat/allformats.c | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index fc87900d96..94f258d2ea 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -41,13 +41,6 @@ #define REGISTER_MUXDEMUX(X, x) REGISTER_MUXER(X, x); REGISTER_DEMUXER(X, x) -#define REGISTER_PROTOCOL(X, x) \ - { \ - extern URLProtocol ff_##x##_protocol; \ - if (CONFIG_##X##_PROTOCOL) \ - ffurl_register_protocol(&ff_##x##_protocol); \ - } - void av_register_all(void) { static int initialized; @@ -367,57 +360,9 @@ void av_register_all(void) REGISTER_DEMUXER (IMAGE_TIFF_PIPE, image_tiff_pipe); REGISTER_DEMUXER (IMAGE_WEBP_PIPE, image_webp_pipe); - - /* protocols */ - REGISTER_PROTOCOL(ASYNC, async); - REGISTER_PROTOCOL(BLURAY, bluray); - REGISTER_PROTOCOL(CACHE, cache); - REGISTER_PROTOCOL(CONCAT, concat); - REGISTER_PROTOCOL(CRYPTO, crypto); - REGISTER_PROTOCOL(DATA, data); - REGISTER_PROTOCOL(FFRTMPCRYPT, ffrtmpcrypt); - REGISTER_PROTOCOL(FFRTMPHTTP, ffrtmphttp); - REGISTER_PROTOCOL(FILE, file); - REGISTER_PROTOCOL(FTP, ftp); - REGISTER_PROTOCOL(GOPHER, gopher); - REGISTER_PROTOCOL(HLS, hls); - REGISTER_PROTOCOL(HTTP, http); - REGISTER_PROTOCOL(HTTPPROXY, httpproxy); - REGISTER_PROTOCOL(HTTPS, https); - REGISTER_PROTOCOL(ICECAST, icecast); - REGISTER_PROTOCOL(MMSH, mmsh); - REGISTER_PROTOCOL(MMST, mmst); - 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(RTMPTS, rtmpts); - REGISTER_PROTOCOL(RTP, rtp); - REGISTER_PROTOCOL(SCTP, sctp); - REGISTER_PROTOCOL(SRTP, srtp); - REGISTER_PROTOCOL(SUBFILE, subfile); - REGISTER_PROTOCOL(TCP, tcp); - REGISTER_PROTOCOL(TLS_SCHANNEL, tls_schannel); - REGISTER_PROTOCOL(TLS_SECURETRANSPORT, tls_securetransport); - REGISTER_PROTOCOL(TLS_GNUTLS, tls_gnutls); - REGISTER_PROTOCOL(TLS_OPENSSL, tls_openssl); - REGISTER_PROTOCOL(UDP, udp); - REGISTER_PROTOCOL(UDPLITE, udplite); - REGISTER_PROTOCOL(UNIX, unix); - /* external libraries */ REGISTER_MUXER (CHROMAPRINT, chromaprint); REGISTER_DEMUXER (LIBGME, libgme); REGISTER_DEMUXER (LIBMODPLUG, libmodplug); REGISTER_MUXDEMUX(LIBNUT, libnut); - REGISTER_PROTOCOL(LIBRTMP, librtmp); - REGISTER_PROTOCOL(LIBRTMPE, librtmpe); - REGISTER_PROTOCOL(LIBRTMPS, librtmps); - REGISTER_PROTOCOL(LIBRTMPT, librtmpt); - REGISTER_PROTOCOL(LIBRTMPTE, librtmpte); - REGISTER_PROTOCOL(LIBSSH, libssh); - REGISTER_PROTOCOL(LIBSMBCLIENT, libsmbclient); } |