[SCM] libav/experimental: Merge MP2, MP3 and MPEG audio demuxer entries.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4d973c6859417f97bb7d7c3fd86a998b9b66aca6
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Mar 2 02:58:22 2009 +0000

    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 83ab910..fa45c08 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
- 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

-- 
Libav/FFmpeg packaging