summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-12-31 15:20:25 +0100
committerNicolas George <nicolas.george@normalesup.org>2013-01-26 11:15:38 +0100
commitfccd8c21c40cf004cacaa6b4bf12695ecb014c1b (patch)
tree0a8fedb1410ae00d037df4eb3ab619eadb181c78 /doc/ffmpeg.texi
parent9648e1495bf6074da6c8f867974ede09f83f73ed (diff)
ffmpeg: add -guess_layout_max option.
Diffstat (limited to 'doc/ffmpeg.texi')
-rw-r--r--doc/ffmpeg.texi6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 5aa45629d4..2c023e12bf 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -611,6 +611,12 @@ This is an alias for @code{-filter:a}, see the @ref{filter_option,,-filter optio
Force audio tag/fourcc. This is an alias for @code{-tag:a}.
@item -absf @var{bitstream_filter}
Deprecated, see -bsf
+@item -guess_layout_max @var{channels} (@emph{input,per-stream})
+If some input channel layout is not known, try to guess only if it
+corresponds to at most the specified number of channels. For example, 2
+tells to @command{ffmpeg} to recognize 1 channel as mono and 2 channels as
+stereo but not 6 channels as 5.1. The default is to always try to guess. Use
+0 to disable all guessing.
@end table
@section Subtitle options: