From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sun, 24 Aug 2014 00:49:06 +0000 (+0200)
Subject: doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
X-Git-Tag: android-x86-6.0-r1~3442^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f78c7032479054a984431e0ecddca46374a4b31;p=android-x86%2Fexternal-ffmpeg.git

doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
---

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}.