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/ffserver.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/ffserver.texi')
| -rw-r--r-- | doc/ffserver.texi | 4 |
1 files changed, 2 insertions, 2 deletions
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 |