aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-08-31 14:17:18 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-08-31 14:17:18 +0200
commitf6ebfeb5b4e659d51c24af07a3b2db4221edc56e (patch)
treea4eb59df7970372ecd8c4bf22f7e33556a9469b8
parent5d6982c13bba56115125de68969f46906038b73e (diff)
downloadffmpeg-f6ebfeb5b4e659d51c24af07a3b2db4221edc56e.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 553d759ba2..e9276c279a 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -407,6 +407,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 -vlang @var{code}
Set the ISO 639 language code (3 letters) of the current video stream.