From 4d973c6859417f97bb7d7c3fd86a998b9b66aca6 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 2 Mar 2009 02:58:22 +0000
Subject: [PATCH] Merge MP2, MP3 and MPEG audio demuxer entries.
Originally committed as revision 17709 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
doc/general.texi | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/doc/general.texi b/doc/general.texi
index 83ab910f59e..fa45c088c8d 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
--
GitLab