mips: intreadwrite: fix inline asm for gcc 4.8

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

diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
index 1824813a1e7a7ebe659883b8f727913bf61991c0..0be9cf06342ae4caf9fe80e24c4e2aaac236fd7f 100644 (file)
--- a/doc/avtools-common-opts.texi
+++ b/doc/avtools-common-opts.texi
@@ -9,8 +9,9 @@ example 'KB', 'MiB', 'G' and 'B' as postfix.
 Options which do not take arguments are boolean options, and set the
 corresponding value to true. They can be set to false by prefixing
 with "no" the option name, for example using "-nofoo" in the
-commandline will set to false the boolean option with name "foo".
+command line will set to false the boolean option with name "foo".
 
+@anchor{Stream specifiers}
 @section Stream specifiers
 Some options are applied per-stream, e.g. bitrate or codec. Stream specifiers
 are used to precisely specify which stream(s) does a given option belong to.
@@ -37,7 +38,7 @@ thread count for the second stream to 4.
 'd' for data and 't' for attachments. If @var{stream_index} is given, then
 matches stream number @var{stream_index} of this type. Otherwise matches all
 streams of this type.
-@item @var{program_id}[:@var{stream_index}]
+@item p:@var{program_id}[:@var{stream_index}]
 If @var{stream_index} is given, then matches stream number @var{stream_index} in
 program with id @var{program_id}. Otherwise matches all streams in this program.
 @end table
@@ -118,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 Libav version.
 
@@ -132,8 +133,8 @@ libavcodec libraries. To see the list of available AVOptions, use the
 @option{-help} option. They are separated into two categories:
 @table @option
 @item generic
-These options can be set for any container, codec or device. Generic options are
-listed under AVFormatContext options for containers/devices and under
+These options can be set for any container, codec or device. Generic options
+are listed under AVFormatContext options for containers/devices and under
 AVCodecContext options for codecs.
 @item private
 These options are specific to the given container, device or codec. Private
@@ -144,14 +145,17 @@ For example to write an ID3v2.3 header instead of a default ID3v2.4 to
 an MP3 file, use the @option{id3v2_version} private option of the MP3
 muxer:
 @example
-ffmpeg -i input.flac -id3v2_version 3 out.mp3
+avconv -i input.flac -id3v2_version 3 out.mp3
 @end example
 
 All codec AVOptions are obviously per-stream, so the chapter on stream
 specifiers applies to them
 
-Note -nooption syntax cannot be used for boolean AVOptions, use -option
-0/-option 1.
+Note @option{-nooption} syntax cannot be used for boolean AVOptions,
+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