[FFmpeg-cvslog] doc: add entry for APNG demuxer where needed.

[Benoit Fouet]

ffmpeg | branch: master | Benoit Fouet <benoit.fouet at free.fr> | Tue Nov 25 10:03:12 2014 +0100| [155f4dd668b8a2a57f1f8dfe225977cdcc5de745] | committer: Michael Niedermayer

doc: add entry for APNG demuxer where needed.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=155f4dd668b8a2a57f1f8dfe225977cdcc5de745
---

 Changelog         |    1 +
 MAINTAINERS       |    1 +
 doc/demuxers.texi |   20 ++++++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/Changelog b/Changelog
index 486c127..7172d0c 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 ef120e4..15b976f 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 e582322..11dfe1b 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".
 
+ at 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.
+
+ at table @option
+ at item -ignore_loop @var{bool}
+Ignore the loop variable in the file if set.
+ at item -max_fps @var{int}
+Maximum framerate in frames per second (0 for no limit).
+ at item -default_fps @var{int}
+Default framerate in frames per second when none is specified in the file
+(0 meaning as fast as possible).
+ at end table
+
 @section asf
 
 Advanced Systems Format demuxer.