Merge MP2, MP3 and MPEG audio demuxer entries.

Originally committed as revision 17709 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/general.texi b/doc/general.texi
index 83ab910f59e6572301e452042d8ca4359a8f983b..fa45c088c8d8478924e016af11d7c19e45d8375b 100644 (file)
--- 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