diff options
| author | Martin Storsjö <martin@martin.st> | 2012-02-14 11:47:31 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-02-14 20:05:31 +0200 |
| commit | 2772258a986fb2da3ca5c6eb423a5024b9e9df27 (patch) | |
| tree | 01f588b56b6a731751b2246cc9ea23553ed5fea2 /libavformat/allformats.c | |
| parent | 08bddfcde5ebf47eec6b108e0909c70da6529331 (diff) | |
| download | ffmpeg-2772258a986fb2da3ca5c6eb423a5024b9e9df27.tar.gz | |
libavformat: Rename the applehttp demuxer to hls
When this demuxer was created, there didn't seem to be any
consensus of a common short name for this protocol. Now
the consensus seems to be to call it hls.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 9a559936f8..af6ad97e92 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -59,7 +59,6 @@ void av_register_all(void) REGISTER_DEMUXER (ANM, anm); REGISTER_DEMUXER (APC, apc); REGISTER_DEMUXER (APE, ape); - REGISTER_DEMUXER (APPLEHTTP, applehttp); REGISTER_MUXDEMUX (ASF, asf); REGISTER_MUXDEMUX (ASS, ass); REGISTER_MUXER (ASF_STREAM, asf_stream); @@ -104,6 +103,7 @@ void av_register_all(void) REGISTER_MUXDEMUX (H261, h261); REGISTER_MUXDEMUX (H263, h263); REGISTER_MUXDEMUX (H264, h264); + REGISTER_DEMUXER (HLS, hls); REGISTER_DEMUXER (IDCIN, idcin); REGISTER_DEMUXER (IFF, iff); REGISTER_MUXDEMUX (IMAGE2, image2); |