Merge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768'

[ffmpeg] / doc / demuxers.texi

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index e4c358c6982cd84e7ba67515fcd1ba13f508e432..c8eec219e8fe49ac9e8a341d592a8252aa55596b 100644 (file)
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -56,6 +56,8 @@ following directive is recognized:
 Path to a file to read; special characters and spaces must be escaped with
 backslash or single quotes.
 
+All subsequent directives apply to that file.
+
 @item @code{ffconcat version 1.0}
 Identify the script type and version. It also sets the @option{safe} option
 to 1 if it was to its default -1.
@@ -64,6 +66,11 @@ 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.
 
+@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
+file is not available or accurate.
+
 @end table
 
 @subsection Options