diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 16:55:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 17:26:45 +0100 |
| commit | a6be21d3baf09be1e22648e4802b955191d26b67 (patch) | |
| tree | 6762797c6fa93501e2a275340aa8739f0c32e7c6 /doc/muxers.texi | |
| parent | 0fecf2642b9d909820683647c70031a954f5e58d (diff) | |
| download | ffmpeg-a6be21d3baf09be1e22648e4802b955191d26b67.tar.gz | |
Revert "replace FFmpeg with Libav in doc/"
This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4.
Conflicts:
doc/optimization.txt
Diffstat (limited to 'doc/muxers.texi')
| -rw-r--r-- | doc/muxers.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index ead986914c..e7cfc4a9bc 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1,10 +1,10 @@ @chapter Muxers @c man begin MUXERS -Muxers are configured elements in Libav which allow writing +Muxers are configured elements in FFmpeg which allow writing multimedia streams to a particular type of file. -When you configure your Libav build, all the supported muxers +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}. |