Support detecting and demuxing EIA-608 subtitles in mov.

[ffmpeg] / doc / avtools-common-opts.texi

diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
index 1a50d6e6b2c9c2163f1af70ce79f2d0180366cbd..c25b535a9d3b6a94d3cc7b32960308378727a105 100644 (file)
--- a/doc/avtools-common-opts.texi
+++ b/doc/avtools-common-opts.texi
@@ -119,8 +119,8 @@ Set the logging level used by the library.
 By default the program logs to stderr, if coloring is supported by the
 terminal, colors are used to mark errors and warnings. Log coloring
 can be disabled setting the environment variable
-@env{FFMPEG_FORCE_NOCOLOR} or @env{NO_COLOR}, or can be forced setting
-the environment variable @env{FFMPEG_FORCE_COLOR}.
+@env{AV_LOG_FORCE_NOCOLOR} or @env{NO_COLOR}, or can be forced setting
+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 FFmpeg version.
 
@@ -134,6 +134,15 @@ It also implies @code{-loglevel verbose}.
 Note: setting the environment variable @code{FFREPORT} to any value has the
 same effect.
 
+@item -cpuflags flags (@emph{global})
+Allows setting and clearing cpu flags. This option is intended
+for testing. Do not use it unless you know what you're doing.
+@example
+ffmpeg -cpuflags -sse+mmx ...
+ffmpeg -cpuflags mmx ...
+ffmpeg -cpuflags 0 ...
+@end example
+
 @end table
 
 @section AVOptions
@@ -166,3 +175,6 @@ use @option{-option 0}/@option{-option 1}.
 
 Note2 old undocumented way of specifying per-stream AVOptions by prepending
 v/a/s to the options name is now obsolete and will be removed soon.
+
+@include avoptions_codec.texi
+@include avoptions_format.texi