aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-08-31 14:16:36 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-08-31 14:16:36 +0200
commit3f78fe1d5681b1275e48796dd9ede5ab7bf56f87 (patch)
tree766d31cd1da17cc1df96551cc8afa2fe59fa646f /doc
parentfb52da522c0e71b17056e4e3b06af80b88ef8b1a (diff)
downloadffmpeg-3f78fe1d5681b1275e48796dd9ede5ab7bf56f87.tar.gz
Clarify that -passlogfile has a different syntax when used with -vcodec libx264.
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 44c2ad42ed..1599b0c6c5 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -340,6 +340,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.