Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-01-21 15:54:14 +0300
committerMichael Niedermayer <michaelni@gmx.at>2011-01-23 21:32:08 +0300
commite6d4019503645f1a7cf8bf5c06c7cf0d36e924a3 (patch)
tree57182b1e346bca221cc80ff59f21d774c69092cb
parent22f73157b71807e1ff88c916dbf83ea31b1b50ce (diff)
Amend documentation for the image2 demuxer, to better reflect the current behavior.
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 10ed96c78fde80da9d5bac9b267369861a4f33ba)
-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