diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-08-24 02:49:06 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-08-24 02:49:06 +0200 |
| commit | 6f78c7032479054a984431e0ecddca46374a4b31 (patch) | |
| tree | 920f7958a08b7df5d9ca2fa7a88bf661d4b18e21 /doc/ffmpeg.texi | |
| parent | 0744daa887cab007404388da9cba34149781c605 (diff) | |
| download | ffmpeg-6f78c7032479054a984431e0ecddca46374a4b31.tar.gz | |
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
Diffstat (limited to 'doc/ffmpeg.texi')
| -rw-r--r-- | doc/ffmpeg.texi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 69ffa878fb..1bca962662 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -473,6 +473,9 @@ Set frame rate (Hz value, fraction or abbreviation). As an input option, ignore any timestamps stored in the file and instead generate timestamps assuming constant frame rate @var{fps}. +This is not the same as the @option{-framerate} option used for some input formats +like image2 or v4l2 (it used to be the same in older versions of FFmpeg). +If in doubt use @option{-framerate} instead of the input option @option{-r}. As an output option, duplicate or drop input frames to achieve constant output frame rate @var{fps}. |