virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

libavformat: Rename the applehttp demuxer to hls

Browse Source 
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>
This commit is contained in:
Martin Storsjö
2012-02-14 11:47:31 +02:00
parent 08bddfcde5
commit 2772258a98
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@@ -33,7 +33,6 @@ OBJS-$(CONFIG_AMR_MUXER) += amr.o
OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o
OBJS-$(CONFIG_APC_DEMUXER) += apc.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o
OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o
OBJS-$(CONFIG_APPLEHTTP_DEMUXER) += applehttp.o
OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \ OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \
avlanguage.o avlanguage.o
OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o
@@ -103,6 +102,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o
OBJS-$(CONFIG_H263_MUXER) += rawenc.o OBJS-$(CONFIG_H263_MUXER) += rawenc.o
OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o
OBJS-$(CONFIG_H264_MUXER) += rawenc.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o
OBJS-$(CONFIG_HLS_DEMUXER) += hls.o
OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o
OBJS-$(CONFIG_IFF_DEMUXER) += iff.o OBJS-$(CONFIG_IFF_DEMUXER) += iff.o
OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2.o OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2.o

2
libavformat/allformats.c
View File

@@ -59,7 +59,6 @@ void av_register_all(void)
REGISTER_DEMUXER (ANM, anm); REGISTER_DEMUXER (ANM, anm);
REGISTER_DEMUXER (APC, apc); REGISTER_DEMUXER (APC, apc);
REGISTER_DEMUXER (APE, ape); REGISTER_DEMUXER (APE, ape);
REGISTER_DEMUXER (APPLEHTTP, applehttp);
REGISTER_MUXDEMUX (ASF, asf); REGISTER_MUXDEMUX (ASF, asf);
REGISTER_MUXDEMUX (ASS, ass); REGISTER_MUXDEMUX (ASS, ass);
REGISTER_MUXER (ASF_STREAM, asf_stream); REGISTER_MUXER (ASF_STREAM, asf_stream);
@@ -104,6 +103,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX (H261, h261); REGISTER_MUXDEMUX (H261, h261);
REGISTER_MUXDEMUX (H263, h263); REGISTER_MUXDEMUX (H263, h263);
REGISTER_MUXDEMUX (H264, h264); REGISTER_MUXDEMUX (H264, h264);
REGISTER_DEMUXER (HLS, hls);
REGISTER_DEMUXER (IDCIN, idcin); REGISTER_DEMUXER (IDCIN, idcin);
REGISTER_DEMUXER (IFF, iff); REGISTER_DEMUXER (IFF, iff);
REGISTER_MUXDEMUX (IMAGE2, image2); REGISTER_MUXDEMUX (IMAGE2, image2);

4
libavformat/applehttp.c → libavformat/hls.c
View File

@@ -699,8 +699,8 @@ static int applehttp_probe(AVProbeData *p)
return 0; return 0;
} }
AVInputFormat ff_applehttp_demuxer = { AVInputFormat ff_hls_demuxer = {
.name = "applehttp", .name = "hls",
.long_name = NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming format"), .long_name = NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming format"),
.priv_data_size = sizeof(AppleHTTPContext), .priv_data_size = sizeof(AppleHTTPContext),
.read_probe = applehttp_probe, .read_probe = applehttp_probe,