aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-01-21 13:54:14 +0100
committerMans Rullgard <mans@mansr.com>2011-01-22 14:48:08 +0000
commit10ed96c78fde80da9d5bac9b267369861a4f33ba (patch)
treea01d37cabe4d5a03de046491666558c9132c9418
parentdb2ddd38859b26c0a4e4bf92619625cd7e0e7f42 (diff)
downloadffmpeg-10ed96c78fde80da9d5bac9b267369861a4f33ba.tar.gz
Amend documentation for the image2 demuxer, to better reflect the current behavior.
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--doc/demuxers.texi21
1 files changed, 13 insertions, 8 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 5fcaf4ff84..05316ce5cd 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -24,20 +24,18 @@ Image file demuxer.
This demuxer reads from a list of image files specified by a pattern.
-The filename of each file to read must contain a sequential number,
-which specifies the position of the file in the sequence.
-
-The pattern must contain the string "%d" or "%0@var{N}d", which
-specifies the position of the characters representing the seqential
+The pattern may contain the string "%d" or "%0@var{N}d", which
+specifies the position of the characters representing a sequential
number in each filename matched by the pattern. If the form
"%d0@var{N}d" is used, the string representing the number in each
filename is 0-padded and @var{N} is the total number of 0-padded
digits representing the number. The literal character '%' can be
specified in the pattern with the string "%%".
-The first filename of the file sequence specified by the pattern must
-contain a number inclusively contained between 0 and 4, all the
-following numbers must be sequential.
+If the pattern contains "%d" or "%0@var{N}d", the first filename of
+the file list specified by the pattern must contain a number
+inclusively contained between 0 and 4, all the following numbers must
+be sequential. This limitation may be hopefully fixed.
The pattern may contain a suffix which is used to automatically
determine the format of the images contained in the files.
@@ -59,4 +57,11 @@ second:
ffmpeg -r 10 -f image2 -i 'img-%03d.jpeg' out.avi
@end example
+Note that the pattern must not necessarily contain "%d" or
+"%0@var{N}d", for example to convert a single image file
+@file{img.jpeg} you can employ the command:
+@example
+ffmpeg -f image2 -i img.jpeg img.png
+@end example
+
@c man end INPUT DEVICES