diff options
| author | Martin Storsjö <martin@martin.st> | 2012-02-14 12:00:49 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-02-14 20:05:32 +0200 |
| commit | 8bdab32f4ee402bbd7bf5a61b0ccbcc59569bfb0 (patch) | |
| tree | e2357084d8c632c275a36b540fb56588678b467d /libavformat/allformats.c | |
| parent | 65cd7bf32f384db919b81b07d8e3201d6af4fb06 (diff) | |
| download | ffmpeg-8bdab32f4ee402bbd7bf5a61b0ccbcc59569bfb0.tar.gz | |
libavformat: Rename the applehttp protocol to hls
Keep the old protocol name around for backwards compatibility
until the next bump.
Deprecate the method of implicitly assuming the nested protocol.
For applehttp://server/path, it might have felt logical, but
supporting hls://server/path isn't quite as intuitive. Therefore
only support hls+http://server/path from now on.
Using this protocol at all is discouraged, since the hls demuxer
is more complete and fits into the architecture better. There
have been cases where the protocol implementation worked better
than the demuxer, but this should no longer be the case.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index af6ad97e92..a60688c362 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -22,6 +22,7 @@ #include "rtp.h" #include "rdt.h" #include "url.h" +#include "version.h" #define REGISTER_MUXER(X,x) { \ extern AVOutputFormat ff_##x##_muxer; \ @@ -238,11 +239,14 @@ void av_register_all(void) REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe); /* protocols */ +#if FF_API_APPLEHTTP_PROTO REGISTER_PROTOCOL (APPLEHTTP, applehttp); +#endif REGISTER_PROTOCOL (CONCAT, concat); REGISTER_PROTOCOL (CRYPTO, crypto); REGISTER_PROTOCOL (FILE, file); REGISTER_PROTOCOL (GOPHER, gopher); + REGISTER_PROTOCOL (HLS, hls); REGISTER_PROTOCOL (HTTP, http); REGISTER_PROTOCOL (HTTPPROXY, httpproxy); REGISTER_PROTOCOL (HTTPS, https); |