From 2772258a986fb2da3ca5c6eb423a5024b9e9df27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 14 Feb 2012 11:47:31 +0200
Subject: [PATCH] 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ö <martin@martin.st>
---
libavformat/Makefile | 2 +-
libavformat/allformats.c | 2 +-
libavformat/{applehttp.c => hls.c} | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
rename libavformat/{applehttp.c => hls.c} (99%)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index cacfaf85609..a54a8f569a7 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -33,7 +33,6 @@ OBJS-$(CONFIG_AMR_MUXER) += amr.o
OBJS-$(CONFIG_ANM_DEMUXER) += anm.o
OBJS-$(CONFIG_APC_DEMUXER) += apc.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 \
avlanguage.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_H264_DEMUXER) += h264dec.o rawdec.o
OBJS-$(CONFIG_H264_MUXER) += rawenc.o
+OBJS-$(CONFIG_HLS_DEMUXER) += hls.o
OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o
OBJS-$(CONFIG_IFF_DEMUXER) += iff.o
OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 9a559936f82..af6ad97e928 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);
diff --git a/libavformat/applehttp.c b/libavformat/hls.c
similarity index 99%
rename from libavformat/applehttp.c
rename to libavformat/hls.c
index 32a51fede1a..13b9b27378c 100644
--- a/libavformat/applehttp.c
+++ b/libavformat/hls.c
@@ -699,8 +699,8 @@ static int applehttp_probe(AVProbeData *p)
return 0;
}
-AVInputFormat ff_applehttp_demuxer = {
- .name = "applehttp",
+AVInputFormat ff_hls_demuxer = {
+ .name = "hls",
.long_name = NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming format"),
.priv_data_size = sizeof(AppleHTTPContext),
.read_probe = applehttp_probe,
--
GitLab