[FFmpeg-devel] [PATCH] Add muxers.texi file.

[Janne Grunau]

On Wed, Jan 26, 2011 at 11:55:53PM +0100, Stefano Sabatini wrote:

> From 3a57aac3de3f5adb870bcdfacacf740dd795288d Mon Sep 17 00:00:00 2001
> From: Stefano Sabatini <stefano.sabatini-lala at poste.it>
> Date: Wed, 26 Jan 2011 21:51:12 +0100
> Subject: [PATCH] Add muxers.texi file.
> 
> ---
>  doc/ffmpeg.texi  |    1 +
>  doc/ffplay.texi  |    1 +
>  doc/ffprobe.texi |    1 +
>  doc/muxers.texi  |   21 +++++++++++++++++++++
>  4 files changed, 24 insertions(+), 0 deletions(-)
>  create mode 100644 doc/muxers.texi
> 
> 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

ok and queued

Janne