Commit 640b6504 authored by diego's avatar diego

Merge MP2, MP3 and MPEG audio demuxer entries.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17709 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ebe4886b
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment