From a6be21d3baf09be1e22648e4802b955191d26b67 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 Mar 2011 16:55:58 +0100 Subject: Revert "replace FFmpeg with Libav in doc/" This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4. Conflicts: doc/optimization.txt --- doc/demuxers.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/demuxers.texi') diff --git a/doc/demuxers.texi b/doc/demuxers.texi index bbdde9c92d..05316ce5cd 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -1,10 +1,10 @@ @chapter Demuxers @c man begin DEMUXERS -Demuxers are configured elements in Libav which allow to read the +Demuxers are configured elements in FFmpeg which allow to read the multimedia streams from a particular type of file. -When you configure your Libav build, all the supported demuxers +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". -- cgit v1.2.3