[FFmpeg-cvslog] r17709 - trunk/doc/general.texi

[diego]

Author: diego
Date: Mon Mar  2 03:58:22 2009
New Revision: 17709

Log:
Merge MP2, MP3 and MPEG audio demuxer entries.

Modified:
   trunk/doc/general.texi

Modified: trunk/doc/general.texi
==============================================================================
--- trunk/doc/general.texi	Mon Mar  2 03:48:30 2009	(r17708)
+++ trunk/doc/general.texi	Mon Mar  2 03:58:22 2009	(r17709)
@@ -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
- at item MP2                       @tab X @tab
- at item MP3                       @tab X @tab
- at item MPEG audio                @tab X @tab X
+ at item MP2                       @tab X @tab X
+ at 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