Add demuxers.texi file.

Originally committed as revision 26282 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 6731103..d158507 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -116,9 +116,9 @@ documentation: $(addprefix doc/, developer.html faq.html general.html libavfilte
 
 $(HTMLPAGES) $(PODPAGES): doc/fftools-common-opts.texi
 
-doc/ffmpeg.pod doc/ffmpeg.html: doc/bitstream_filters.texi doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi doc/metadata.texi
-doc/ffplay.pod doc/ffplay.html: doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi
-doc/ffprobe.pod doc/ffprobe.html: doc/indevs.texi doc/protocols.texi
+doc/ffmpeg.pod doc/ffmpeg.html: doc/demuxers.texi doc/bitstream_filters.texi doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi doc/metadata.texi
+doc/ffplay.pod doc/ffplay.html: doc/demuxers.texi doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi
+doc/ffprobe.pod doc/ffprobe.html: doc/demuxers.texi doc/indevs.texi doc/protocols.texi
 doc/libavfilter.html: doc/filters.texi
 
 doc/%.html: TAG = HTML

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
new file mode 100644 (file)
index 0000000..d6d9d96
--- /dev/null
+++ b/doc/demuxers.texi
@@ -0,0 +1,21 @@
+@chapter Demuxers
+@c man begin DEMUXERS
+
+Demuxers are configured elements in FFmpeg which allow to read the
+multimedia streams from a particular type of file.
+
+When you configure your FFmpeg build, all the supported demuxers
+are enabled by default. You can list all available ones using the
+configure option "--list-demuxers".
+
+You can disable all the demuxers using the configure option
+"--disable-demuxers", and selectively enable a single demuxer with
+the option "--enable-demuxer=@var{DEMUXER}", or disable it
+with the option "--disable-demuxer=@var{DEMUXER}".
+
+The option "-formats" of the ff* tools will display the list of
+enabled demuxers.
+
+The description of some of the currently available demuxers follows.
+
+@c man end INPUT DEVICES

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index d73ae46..abe0ac1 100644 (file)
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -944,6 +944,7 @@ file to which you want to add them.
 @c man end EXAMPLES
 
 @include eval.texi
+@include demuxers.texi
 @include indevs.texi
 @include outdevs.texi
 @include protocols.texi

diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index 07c8875..c9c38da 100644 (file)
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -154,6 +154,7 @@ Seek to percentage in file corresponding to fraction of width.
 @c man end
 
 @include eval.texi
+@include demuxers.texi
 @include indevs.texi
 @include outdevs.texi
 @include protocols.texi

diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi
index 0b5c11a..8f3a5a9 100644 (file)
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -109,6 +109,7 @@ with name "STREAM".
 @end table
 @c man end
 
+@include demuxers.texi
 @include protocols.texi
 @include indevs.texi