diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-24 03:58:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-24 03:58:14 +0200 |
| commit | 1aa153d644792d2a9b3a6776b1b0ef906fb7feb1 (patch) | |
| tree | 619239b8dfaaef4a2d456afef053fa22d8e24960 /doc/ffmpeg.texi | |
| parent | 50a4d5cfc6749932347ee38c25b5040aea4b13a0 (diff) | |
| parent | 7c0c97cc05afeaa52dfad902ae6639557fb71261 (diff) | |
| download | ffmpeg-1aa153d644792d2a9b3a6776b1b0ef906fb7feb1.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
fate: Fix ffprobe tests with --target-path set.
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
Do not print a useless error number if mov header reading fails.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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}. |