doc: Add muxers/demuxers list option

Signed-off-by: Mulvya <mulvya@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index c12c07e27201f3dc99e5205804403d246ffd4932..29a23d48b258ca5b637ed0b42d15f15c7dda5055 100644 (file)
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -13,8 +13,9 @@ You can disable all the demuxers using the configure option
 the option @code{--enable-demuxer=@var{DEMUXER}}, or disable it
 with the option @code{--disable-demuxer=@var{DEMUXER}}.
 
-The option @code{-formats} of the ff* tools will display the list of
-enabled demuxers.
+The option @code{-demuxers} of the ff* tools will display the list of
+enabled demuxers. Use @code{-formats} to view a combined list of
+enabled demuxers and muxers.
 
 The description of some of the currently available demuxers follows.
 

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 996d6a6cc48a816f863cd1fe9bdf598f675f6a2b..11b527da4307cdf2862fa8ab4a2f3213f00ee252 100644 (file)
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1547,7 +1547,7 @@ to enable LAME support by passing @code{--enable-libmp3lame} to configure.
 The mapping is particularly useful for DVD transcoding
 to get the desired audio language.
 
-NOTE: To see the supported input formats, use @code{ffmpeg -formats}.
+NOTE: To see the supported input formats, use @code{ffmpeg -demuxers}.
 
 @item
 You can extract images from a video, or create a video from many images:

diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index a8e485f43abdb54cc3ff6024e22359c4d22afb2c..7269aeece915e5d77d431b14d98c306edd426049 100644 (file)
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -110,6 +110,12 @@ Show version.
 @item -formats
 Show available formats (including devices).
 
+@item -demuxers
+Show available demuxers.
+
+@item -muxers
+Show available muxers.
+
 @item -devices
 Show available devices.
 

diff --git a/doc/muxers.texi b/doc/muxers.texi
index cb875a463621672254a0031db4dda6dbaf27e7c3..6a9505e8ecf9be3960ddac876db4860f4f1cb776 100644 (file)
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -13,8 +13,9 @@ You can disable all the muxers with the configure option
 with the options @code{--enable-muxer=@var{MUXER}} /
 @code{--disable-muxer=@var{MUXER}}.
 
-The option @code{-formats} of the ff* tools will display the list of
-enabled muxers.
+The option @code{-muxers} of the ff* tools will display the list of
+enabled muxers. Use @code{-formats} to view a combined list of
+enabled demuxers and muxers.
 
 A description of some of the currently available muxers follows.