From d0d25a5e1f889f818e9afdd9a88b4a8ddf559300 Mon Sep 17 00:00:00 2001 From: Arnaud Vrac Date: Fri, 19 Jul 2013 01:49:07 +0200 Subject: [PATCH] qtdemux: set proper caps for mpeg-1 audio Remove AAC specific fields from mpeg-1 audio caps, remove assumption that the mpeg1 audio layer is 3, and set `parsed' field. https://bugzilla.gnome.org/show_bug.cgi?id=704548 --- gst/isomp4/qtdemux.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index 73e551f7c6..29bc700c12 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -9948,12 +9948,11 @@ gst_qtdemux_handle_esds (GstQTDemux * qtdemux, QtDemuxStream * stream, "mpegversion", G_TYPE_INT, 2, "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); break; - case 0x69: /* MP3 has two different values, accept either */ - case 0x6B: - /* change to mpeg1 layer 3 audio */ - gst_caps_set_simple (stream->caps, "layer", G_TYPE_INT, 3, - "mpegversion", G_TYPE_INT, 1, NULL); - codec_name = "MPEG-1 layer 3"; + case 0x69: /* MPEG-2 BC audio */ + case 0x6B: /* MPEG-1 audio */ + caps = gst_caps_new_simple ("audio/mpeg", + "mpegversion", G_TYPE_INT, 1, "parsed", G_TYPE_BOOLEAN, TRUE, NULL); + codec_name = "MPEG-1 audio"; break; case 0x6A: /* MPEG-1 */ codec_name = "MPEG-1 video";