Commit cd223e0b authored by Martin Storsjö's avatar Martin Storsjö

Add Apple HTTP Live Streaming demuxer

Originally committed as revision 24834 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e55ebcc3
...@@ -30,6 +30,7 @@ version <next>: ...@@ -30,6 +30,7 @@ version <next>:
- RTP depacketization of MP4A-LATM - RTP depacketization of MP4A-LATM
- RTP packetization and depacketization of VP8 - RTP packetization and depacketization of VP8
- hflip filter - hflip filter
- Apple HTTP Live Streaming demuxer
version 0.6: version 0.6:
......
...@@ -49,6 +49,7 @@ library: ...@@ -49,6 +49,7 @@ library:
@item American Laser Games MM @tab @tab X @item American Laser Games MM @tab @tab X
@tab Multimedia format used in games like Mad Dog McCree. @tab Multimedia format used in games like Mad Dog McCree.
@item 3GPP AMR @tab X @tab X @item 3GPP AMR @tab X @tab X
@item Apple HTTP Live Streaming @tab @tab X
@item ASF @tab X @tab X @item ASF @tab X @tab X
@item AVI @tab X @tab X @item AVI @tab X @tab X
@item AVISynth @tab @tab X @item AVISynth @tab @tab X
......
...@@ -28,6 +28,7 @@ OBJS-$(CONFIG_AMR_MUXER) += amr.o ...@@ -28,6 +28,7 @@ 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 \
riff.o avlanguage.o riff.o avlanguage.o
OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o riff.o OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o riff.o
......
...@@ -56,6 +56,7 @@ void av_register_all(void) ...@@ -56,6 +56,7 @@ 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);
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment