[vlc-commits] core: differentiate mp2 from mp3 audio layers

Ilkka Ollakka git at videolan.org
Fri Jan 10 12:37:56 CET 2014


vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Mon Jan  6 21:49:25 2014 +0200| [03fe7c3da8e32de622ab892ce611a029067a4bb6] | committer: Ilkka Ollakka

core: differentiate mp2 from mp3 audio layers

ref #10318

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=03fe7c3da8e32de622ab892ce611a029067a4bb6
---

 src/misc/fourcc.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index a87cc64..91c0071 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1065,19 +1065,22 @@ static const staticentry_t p_list_audio[] = {
     B(VLC_CODEC_SIPR, "RealAudio Sipr"),
         A("sipr"),
 
-    /* MPEG Audio layer 1/2/3 */
-    B(VLC_CODEC_MPGA, "MPEG Audio layer 1/2/3"),
+    /* MPEG Audio layer 1/2 */
+    B(VLC_CODEC_MPGA, "MPEG Audio layer 1/2"),
         A("mpga"),
         A("mp2a"),
         A(".mp1"),
         A(".mp2"),
-        A("mp3 "),
-        A(".mp3"),
-        A("MP3 "),
         A("LAME"),
         A("ms\x00\x50"),
         A("ms\x00\x55"),
 
+    /* MPEG Audio layer 3 */
+    B(VLC_CODEC_MP3, "MPEG Audio layer 3"),
+        A("mp3 "),
+        A(".mp3"),
+        A("MP3 "),
+
     /* A52 Audio (aka AC3) */
     B(VLC_CODEC_A52, "A52 Audio (aka AC3)"),
         A("a52 "),



More information about the vlc-commits mailing list