diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-26 23:55:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-30 03:41:00 +0100 |
| commit | 6219b67e8433325a7a159497262f7a9aaf48ad67 (patch) | |
| tree | d1f88eeec32c029bffa1f7cdfd78a1299757db55 | |
| parent | 753134ae3e2d40bb80b286edaa0c7c8781db51f6 (diff) | |
| download | ffmpeg-6219b67e8433325a7a159497262f7a9aaf48ad67.tar.gz | |
Add muxers.texi file.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 85466e1e5f7f1fe50933d2d967a06b45b9222b5b)
| -rw-r--r-- | doc/ffmpeg.texi | 1 | ||||
| -rw-r--r-- | doc/ffplay.texi | 1 | ||||
| -rw-r--r-- | doc/ffprobe.texi | 1 | ||||
| -rw-r--r-- | doc/muxers.texi | 21 |
4 files changed, 24 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 1732c9b4bf..98f2031f75 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -977,6 +977,7 @@ file to which you want to add them. @include eval.texi @include demuxers.texi +@include muxers.texi @include indevs.texi @include outdevs.texi @include protocols.texi diff --git a/doc/ffplay.texi b/doc/ffplay.texi index c9c38da189..c03905c3e0 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -155,6 +155,7 @@ Seek to percentage in file corresponding to fraction of width. @include eval.texi @include demuxers.texi +@include muxers.texi @include indevs.texi @include outdevs.texi @include protocols.texi diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 8f3a5a9772..bc96bd561e 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -110,6 +110,7 @@ with name "STREAM". @c man end @include demuxers.texi +@include muxers.texi @include protocols.texi @include indevs.texi diff --git a/doc/muxers.texi b/doc/muxers.texi new file mode 100644 index 0000000000..c3dcf1171c --- /dev/null +++ b/doc/muxers.texi @@ -0,0 +1,21 @@ +@chapter Muxers +@c man begin MUXERS + +Muxers are configured elements in FFmpeg which allow writing +multimedia streams to a particular type of file. + +When you configure your FFmpeg build, all the supported muxers +are enabled by default. You can list all available muxers using the +configure option @code{--list-muxers}. + +You can disable all the muxers with the configure option +@code{--disable-muxers} and selectively enable / disable single muxers +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. + +A description of some of the currently available muxers follows. + +@c man end MUXERS |