diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 16:53:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 17:22:52 +0100 |
| commit | 0fecf2642b9d909820683647c70031a954f5e58d (patch) | |
| tree | 36ca02de9fa27a049829fb589517223d2d0ce5f5 /doc/ffplay.texi | |
| parent | e309fdc7018a1027d187ec27fb1d69a41a4ee167 (diff) | |
| parent | f1f60f5252b0b448adcce0c1c52f3161ee69b9bf (diff) | |
| download | ffmpeg-0fecf2642b9d909820683647c70031a954f5e58d.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 e0518b859e..6199e6d269 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 FFmpeg +FFplay is a very simple and portable media player using the Libav libraries and the SDL library. It is mostly used as a testbed for the -various FFmpeg APIs. +various Libav 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 FFmpeg HTML documentation +ffmpeg(1), ffprobe(1), ffserver(1) and the Libav HTML documentation @c man end @c man begin AUTHORS -The FFmpeg developers +The Libav developers @c man end @end ignore |