summaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-08-19 14:54:37 +0000
committerMartin Storsjö <martin@martin.st>2010-08-19 14:54:37 +0000
commitcd223e0b4e1371d12d6cbb36bb66afdc40fd6281 (patch)
tree6c9f36285217f78b9d90133e981263fbea9abbc0 /doc/general.texi
parente55ebcc3f6cf1f00ffd56ef0f357dc8010c6e046 (diff)
downloadffmpeg-streaming-cd223e0b4e1371d12d6cbb36bb66afdc40fd6281.zip
ffmpeg-streaming-cd223e0b4e1371d12d6cbb36bb66afdc40fd6281.tar.gz
Add Apple HTTP Live Streaming demuxer
Originally committed as revision 24834 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 68fae98..62126cd 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -49,6 +49,7 @@ library:
@item American Laser Games MM @tab @tab X
@tab Multimedia format used in games like Mad Dog McCree.
@item 3GPP AMR @tab X @tab X
+@item Apple HTTP Live Streaming @tab @tab X
@item ASF @tab X @tab X
@item AVI @tab X @tab X
@item AVISynth @tab @tab X
OpenPOWER on IntegriCloud