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/ffserver.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/ffserver.texi') diff --git a/doc/ffserver.texi b/doc/ffserver.texi index 021b237de5..0cab3c8a98 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -266,11 +266,11 @@ rather than as a daemon. @c man begin SEEALSO ffmpeg(1), ffplay(1), ffprobe(1), the @file{ffmpeg/doc/ffserver.conf} -example and the Libav HTML documentation +example and the FFmpeg HTML documentation @c man end @c man begin AUTHORS -The Libav developers +The FFmpeg developers @c man end @end ignore -- cgit v1.2.3