Add muxers.texi file.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 1732c9b4bfd805d16508a8a4f60d6d384ffdb6d2..98f2031f75359aaddd41c94000374186c428013c 100644 (file)
--- 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 c9c38da189056b21c05269c81d0b03366e13ffca..c03905c3e0bff2c2d653a0bc73d88058b08e3067 100644 (file)
--- 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 8f3a5a9772a9a4a90de7b843869cc051753b8157..bc96bd561e6fef58822a7394e37d7c2241aec489 100644 (file)
--- 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 (file)
index 0000000..c3dcf11
--- /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