From 2772258a986fb2da3ca5c6eb423a5024b9e9df27 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 14 Feb 2012 11:47:31 +0200 Subject: libavformat: Rename the applehttp demuxer to hls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- libavformat/allformats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/allformats.c') 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); -- cgit v1.2.3