aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2014-11-25 10:03:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-25 18:28:32 +0100
commit155f4dd668b8a2a57f1f8dfe225977cdcc5de745 (patch)
tree2a1f369b064dfd5bc76aa59eb3bd36ba0c2ccf4f
parentbc3d02fa88c4d1a45952da8d058f5667913627b9 (diff)
downloadffmpeg-155f4dd668b8a2a57f1f8dfe225977cdcc5de745.tar.gz
doc: add entry for APNG demuxer where needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--Changelog1
-rw-r--r--MAINTAINERS1
-rw-r--r--doc/demuxers.texi20
3 files changed, 22 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 486c127d17..7172d0cfb6 100644
--- a/Changelog
+++ b/Changelog
@@ -16,6 +16,7 @@ version <next>:
- creating DASH compatible fragmented MP4, MPEG-DASH segmenting muxer
- WebP muxer with animated WebP support
- zygoaudio decoding support
+- APNG demuxer
version 2.4:
diff --git a/MAINTAINERS b/MAINTAINERS
index ef120e4d9e..15b976fee7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -386,6 +386,7 @@ Muxers/Demuxers:
aiffdec.c Baptiste Coudurier, Matthieu Bouron
aiffenc.c Baptiste Coudurier, Matthieu Bouron
ape.c Kostya Shishkov
+ apngdec.c Benoit Fouet
ass* Aurelien Jacobs
astdec.c Paul B Mahol
astenc.c James Almer
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index e5823227af..11dfe1b9c1 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -29,6 +29,26 @@ the caller can decide which variant streams to actually receive.
The total bitrate of the variant that the stream belongs to is
available in a metadata key named "variant_bitrate".
+@section apng
+
+Animated Portable Network Graphics demuxer.
+
+This demuxer is used to demux APNG files.
+All headers, but the PNG signature, up to (but not including) the first
+fcTL chunk are transmitted as extradata.
+Frames are then split as being all the chunks between two fcTL ones, or
+between the last fcTL and IEND chunks.
+
+@table @option
+@item -ignore_loop @var{bool}
+Ignore the loop variable in the file if set.
+@item -max_fps @var{int}
+Maximum framerate in frames per second (0 for no limit).
+@item -default_fps @var{int}
+Default framerate in frames per second when none is specified in the file
+(0 meaning as fast as possible).
+@end table
+
@section asf
Advanced Systems Format demuxer.