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

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Aug 24 02:49:06 2014 +0200| [6f78c7032479054a984431e0ecddca46374a4b31] | committer: Carl Eugen Hoyos

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f78c7032479054a984431e0ecddca46374a4b31
---

 doc/ffmpeg.texi |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 69ffa87..1bca962 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}.