[FFmpeg-devel] [PATCH 3/3] concatdec: update doc

Andrey Utkin andrey.krieger.utkin at gmail.com
Mon Jun 23 13:01:19 CEST 2014

 doc/demuxers.texi | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index d51b9d0..efe4551 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -76,7 +76,7 @@ backslash or single quotes.
 All subsequent file-related directives apply to that file.
- at item @code{ffconcat version 1.0}
+ at item @code{ffconcat version 1.1}
 Identify the script type and version. It also sets the @option{safe} option
 to 1 if it was to its default -1.
@@ -84,6 +84,9 @@ To make FFmpeg recognize the format automatically, this directive must
 appears exactly as is (no extra space or byte-order-mark) on the very first
 line of the script.
+Version 1.0 refers to earlier versions not having directive @code{format} and
+option @option{force_duration}.
 @item @code{duration @var{dur}}
 Duration of the file. This information can be specified from the file;
 specifying it here may be more efficient or help if the information from the
@@ -108,6 +111,9 @@ subfiles will be used.
 This is especially useful for MPEG-PS (VOB) files, where the order of the
 streams is not reliable.
+ at item @code{format}
+Set the demuxer to use when opening the file.
 @end table
 @subsection Options
@@ -136,6 +142,10 @@ Currently, the only conversion is adding the h264_mp4toannexb bitstream
 filter to H.264 streams in MP4 format. This is necessary in particular if
 there are resolution changes.
+ at item force_duration
+If set to 1, demuxer stops reading file entry when frame timestamp reaches
+stated duration.
 @end table
 @section flv

More information about the ffmpeg-devel mailing list