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/ffplay.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/ffplay.texi')
| -rw-r--r-- | doc/ffplay.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ffplay.texi b/doc/ffplay.texi index 6199e6d269..e0518b859e 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -20,9 +20,9 @@ ffplay [options] @file{input_file} @chapter Description @c man begin DESCRIPTION -FFplay is a very simple and portable media player using the Libav +FFplay is a very simple and portable media player using the FFmpeg libraries and the SDL library. It is mostly used as a testbed for the -various Libav APIs. +various FFmpeg APIs. @c man end @chapter Options @@ -169,11 +169,11 @@ Seek to percentage in file corresponding to fraction of width. @settitle FFplay media player @c man begin SEEALSO -ffmpeg(1), ffprobe(1), ffserver(1) and the Libav HTML documentation +ffmpeg(1), ffprobe(1), ffserver(1) and the FFmpeg HTML documentation @c man end @c man begin AUTHORS -The Libav developers +The FFmpeg developers @c man end @end ignore |