diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-03-02 02:58:22 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-03-02 02:58:22 +0000 |
| commit | 4d973c6859417f97bb7d7c3fd86a998b9b66aca6 (patch) | |
| tree | 5fdfd7fe18bffd987bb2e5a653832286587db99e /doc | |
| parent | d70fe5a3496cac3da0c4098ae2917d75c8c26c44 (diff) | |
| download | ffmpeg-4d973c6859417f97bb7d7c3fd86a998b9b66aca6.tar.gz | |
Merge MP2, MP3 and MPEG audio demuxer entries.
Originally committed as revision 17709 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/general.texi b/doc/general.texi index 83ab910f59..fa45c088c8 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -108,9 +108,8 @@ library: @item Motion Pixels MVI @tab @tab X @item MOV/QuickTime/MP4 @tab X @tab X @tab 3GP, 3GP2, PSP, iPod variants supported -@item MP2 @tab X @tab -@item MP3 @tab X @tab -@item MPEG audio @tab X @tab X +@item MP2 @tab X @tab X +@item MP3 @tab X @tab X @item MPEG-1 System @tab X @tab X @tab muxed audio and video, VCD format supported @item MPEG-PS (program stream) @tab X @tab X |