aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-10-14 05:41:45 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-10-22 10:49:31 +0200
commitf825d42bccdb9f89669a586951de7f66a81e80a5 (patch)
treec03aa603a824edff05928d81cb0406b45e97a0ae /doc
parentea71aafd6881d7ce5cffec56feb45488e3ac5221 (diff)
downloadffmpeg-f825d42bccdb9f89669a586951de7f66a81e80a5.tar.gz
avplay: Accept cpuflags option
Quite useful for debugging. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/avconv.texi4
-rw-r--r--doc/avtools-common-opts.texi4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index d137fe2738..714b0e7ab3 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -788,10 +788,6 @@ avconv -i file.mov -an -vn -bsf:s mov2textsub -c:s copy -f rawvideo sub.txt
@item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{output,per-stream})
Force a tag/fourcc for matching streams.
-@item -cpuflags mask (@emph{global})
-Set a mask that's applied to autodetected CPU flags. This option is intended
-for testing. Do not use it unless you know what you're doing.
-
@item -filter_complex @var{filtergraph} (@emph{global})
Define a complex filter graph, i.e. one with arbitrary number of inputs and/or
outputs. For simple graphs -- those with one input and one output of the same
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
index 4be54125de..156319ec4a 100644
--- a/doc/avtools-common-opts.texi
+++ b/doc/avtools-common-opts.texi
@@ -143,6 +143,10 @@ the environment variable @env{AV_LOG_FORCE_COLOR}.
The use of the environment variable @env{NO_COLOR} is deprecated and
will be dropped in a following Libav version.
+@item -cpuflags mask (@emph{global})
+Set a mask that's applied to autodetected CPU flags. This option is intended
+for testing. Do not use it unless you know what you're doing.
+
@end table
@section AVOptions