From d1dc70efd8cd171a671fd077b4b824d432eb5edf Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 30 Oct 2008 10:31:35 +0000 Subject: [PATCH] gst/rtp/: Narrow down the caps of the mpeg audio pay/depayloaders to only accept mpeg version 1. Fixes #558427. Original commit message from CVS: * gst/rtp/gstrtpmpadepay.c: (gst_rtp_mpa_depay_setcaps): * gst/rtp/gstrtpmpapay.c: Narrow down the caps of the mpeg audio pay/depayloaders to only accept mpeg version 1. Fixes #558427. --- ChangeLog | 7 +++++++ gst/rtp/gstrtpmpadepay.c | 5 +++-- gst/rtp/gstrtpmpapay.c | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90e651f..fa19514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-30 Wim Taymans + + * gst/rtp/gstrtpmpadepay.c: (gst_rtp_mpa_depay_setcaps): + * gst/rtp/gstrtpmpapay.c: + Narrow down the caps of the mpeg audio pay/depayloaders to only accept + mpeg version 1. Fixes #558427. + 2008-10-29 Wim Taymans * gst/rtp/gstrtpL16pay.c: (gst_rtp_L16_pay_flush), diff --git a/gst/rtp/gstrtpmpadepay.c b/gst/rtp/gstrtpmpadepay.c index caf34e1..3cbd16b 100644 --- a/gst/rtp/gstrtpmpadepay.c +++ b/gst/rtp/gstrtpmpadepay.c @@ -40,7 +40,7 @@ static GstStaticPadTemplate gst_rtp_mpa_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/mpeg") + GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) 1") ); static GstStaticPadTemplate gst_rtp_mpa_depay_sink_template = @@ -127,7 +127,8 @@ gst_rtp_mpa_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps) clock_rate = 90000; depayload->clock_rate = clock_rate; - outcaps = gst_caps_new_simple ("audio/mpeg", NULL); + outcaps = + gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 1, NULL); res = gst_pad_set_caps (depayload->srcpad, outcaps); gst_caps_unref (outcaps); diff --git a/gst/rtp/gstrtpmpapay.c b/gst/rtp/gstrtpmpapay.c index 200ef38..7b51077 100644 --- a/gst/rtp/gstrtpmpapay.c +++ b/gst/rtp/gstrtpmpapay.c @@ -38,7 +38,7 @@ static GstStaticPadTemplate gst_rtp_mpa_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/mpeg") + GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) 1") ); static GstStaticPadTemplate gst_rtp_mpa_pay_src_template = -- 2.7.4