OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0744daa
)
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 24 Aug 2014 00:49:06 +0000
(
02:49
+0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 24 Aug 2014 00:49:06 +0000
(
02:49
+0200)
doc/ffmpeg.texi
patch
|
blob
|
history
diff --git
a/doc/ffmpeg.texi
b/doc/ffmpeg.texi
index
69ffa87
..
1bca962
100644
(file)
--- 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}.
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}.
As an output option, duplicate or drop input frames to achieve constant output
frame rate @var{fps}.