From 76a5c85de768c993780179b5492c3cdf4c478e6b Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 18 Dec 2003 09:31:49 +0000 Subject: Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding... Original commit message from CVS: Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding. This should fix mp3 playback. --- gst/matroska/matroska-demux.c | 6 ++---- gst/matroska/matroska-mux.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'gst/matroska') diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 45e562ba..371fd18f 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -200,7 +200,7 @@ gst_matroska_demux_init (GstMatroskaDemux *demux) gint i; GST_FLAG_SET (GST_OBJECT (demux), GST_ELEMENT_EVENT_AWARE); - + demux->sinkpad = gst_pad_new_from_template ( gst_element_class_get_pad_template (klass, "sink"), "sink"); gst_element_add_pad (GST_ELEMENT (demux), demux->sinkpad); @@ -2389,7 +2389,6 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *audiocontext, caps = GST_CAPS_NEW ("matroskademux_mpeg1-l1", "audio/mpeg", "mpegversion", GST_PROPS_INT (1), - "systemstream", GST_PROPS_BOOLEAN (FALSE), "layer", GST_PROPS_INT (layer)); } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_PCM_INT_BE) || !strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_PCM_INT_LE)) { @@ -2496,8 +2495,7 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *audiocontext, caps = GST_CAPS_NEW ("matroska_demux_aac_mpeg2", "audio/mpeg", - "mpegversion", GST_PROPS_INT (mpegversion), - "systemstream", GST_PROPS_BOOLEAN (FALSE)); + "mpegversion", GST_PROPS_INT (mpegversion)); } else { GST_WARNING ("Unknown codec '%s', cannot build Caps", codec_id); diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 2f268d8a..df63f2a5 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -416,7 +416,7 @@ gst_matroska_mux_audio_pad_link (GstPad *pad, audiocontext->bitdepth = 16; if (!strcmp (mimetype, "audio/mpeg")) { - gint mpegversion = 1; + gint mpegversion = 0; gst_caps_get_int (caps, "mpegversion", &mpegversion); switch (mpegversion) { -- cgit