summaryrefslogtreecommitdiff
path: root/doc/avtools-common-opts.texi
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2011-12-08 17:39:28 +0100
committerLuca Barbato <lu_zero@gentoo.org>2011-12-09 18:26:31 +0100
commitd5837d7fe922883d4b7609ec33802d44f9af83b5 (patch)
tree6271e2f04279b783e11ec1f8ce89ecd7fbcc3ed2 /doc/avtools-common-opts.texi
parentca410b4eb025c63f2740c8db7ae8d6d98715f5e3 (diff)
doc: update documentation to use avconv
Diffstat (limited to 'doc/avtools-common-opts.texi')
-rw-r--r--doc/avtools-common-opts.texi10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
index ba552fcc29..8892e9e431 100644
--- a/doc/avtools-common-opts.texi
+++ b/doc/avtools-common-opts.texi
@@ -132,8 +132,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 +144,14 @@ 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.