diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 21:49:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 21:50:53 +0200 |
| commit | 647fe2e77733edf6e3a15c490056211bc38ccc20 (patch) | |
| tree | 3387124478a584b39080e590c7f703b3fc230949 /doc | |
| parent | 976e3439ed992b8e06e3737642448a3935b148e4 (diff) | |
| parent | 9e6b5e61a0c91e25e298d0a21b189c4c95443795 (diff) | |
| download | ffmpeg-streaming-647fe2e77733edf6e3a15c490056211bc38ccc20.zip ffmpeg-streaming-647fe2e77733edf6e3a15c490056211bc38ccc20.tar.gz | |
Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'
* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
img2enc: add an option for overwriting one file with subsequent images
Conflicts:
doc/muxers.texi
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/muxers.texi | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 9d119c3..f127494 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -245,9 +245,11 @@ ffmpeg -i in.avi -f image2 -frames:v 1 img.jpeg Start the sequence from @var{number}. Default value is 1. Must be a positive number. -@item updatefirst 1|0 -If set to 1, update the first written image file again and -again. Default value is 0. +@item -update @var{number} +If @var{number} is nonzero, the filename will always be interpreted as just a +filename, not a pattern, and this file will be continuously overwritten with new +images. + @end table The image muxer supports the .Y.U.V image file format. This format is |
