diff options
| author | Mulvya | 2017-02-10 17:10:14 +0530 |
|---|---|---|
| committer | Michael Niedermayer | 2017-02-11 02:59:32 +0100 |
| commit | 40b6e28778653d1f16dc650d841d9adedc781bea (patch) | |
| tree | e4a5c56cd67ac496241f26c1197ff18a248bf481 /doc | |
| parent | 7b3f0b3de4e01778e419140d4c57f2eb798ae954 (diff) | |
doc: Add muxers/demuxers list option
Signed-off-by: Mulvya <mulvya@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/demuxers.texi | 5 | ||||
| -rw-r--r-- | doc/ffmpeg.texi | 2 | ||||
| -rw-r--r-- | doc/fftools-common-opts.texi | 6 | ||||
| -rw-r--r-- | doc/muxers.texi | 5 |
4 files changed, 13 insertions, 5 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index c12c07e272..29a23d48b2 100644 --- 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 996d6a6cc4..11b527da43 100644 --- 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 a8e485f43a..7269aeece9 100644 --- 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 cb875a4636..6a9505e8ec 100644 --- 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. |