aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-08-31 14:17:45 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-08-31 14:17:45 +0200
commitf50bb62eca027374c9f740c14c5b7deb5b23b56c (patch)
tree8ad89faa374578783290c692f871d89bd0c96791
parent84ffe14e2a9abce1e51cbe91988de57bd260327c (diff)
downloadffmpeg-f50bb62eca027374c9f740c14c5b7deb5b23b56c.tar.gz
Clarify that -passlogfile has a different syntax when used with -vcodec libx264.
-rw-r--r--doc/ffmpeg.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index daf5d36de8..95b405ccb3 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -299,6 +299,10 @@ prefix is ``ffmpeg2pass''. The complete file name will be
@file{PREFIX-N.log}, where N is a number specific to the output
stream.
+Note that this option is overwritten by a local option of the same name
+when using @code{-vcodec libx264}. That option maps to the x264 option stats
+which has a different syntax.
+
@item -newvideo
Add a new video stream to the current output stream.