[FFmpeg-cvslog] Add muxers.texi file.
Stefano Sabatini
git
Sun Jan 30 04:15:55 CET 2011
ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Wed Jan 26 23:55:53 2011 +0100| [6219b67e8433325a7a159497262f7a9aaf48ad67] | committer: Michael Niedermayer
Add muxers.texi file.
Signed-off-by: Janne Grunau <janne-ffmpeg at jannau.net>
(cherry picked from commit 85466e1e5f7f1fe50933d2d967a06b45b9222b5b)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6219b67e8433325a7a159497262f7a9aaf48ad67
---
doc/ffmpeg.texi | 1 +
doc/ffplay.texi | 1 +
doc/ffprobe.texi | 1 +
doc/muxers.texi | 21 +++++++++++++++++++++
4 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 1732c9b..98f2031 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
+ at include muxers.texi
@include indevs.texi
@include outdevs.texi
@include protocols.texi
diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index c9c38da..c03905c 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
+ at include muxers.texi
@include indevs.texi
@include outdevs.texi
@include protocols.texi
diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi
index 8f3a5a9..bc96bd5 100644
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -110,6 +110,7 @@ with name "STREAM".
@c man end
@include demuxers.texi
+ at include muxers.texi
@include protocols.texi
@include indevs.texi
diff --git a/doc/muxers.texi b/doc/muxers.texi
new file mode 100644
index 0000000..c3dcf11
--- /dev/null
+++ b/doc/muxers.texi
@@ -0,0 +1,21 @@
+ at chapter Muxers
+ at 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
+ at code{--disable-muxers} and selectively enable / disable single muxers
+with the options @code{--enable-muxer=@var{MUXER}} /
+ at 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.
+
+ at c man end MUXERS
More information about the ffmpeg-cvslog
mailing list