From 67e87defd677733e6293e409c84991ea18a75f74 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 19 Jun 2008 11:06:29 +0000 Subject: [PATCH] gst/rtp/gstrtpg726pay.c: No need to check for audio/G723 and audio/32KADPCM here as they are no longer supported. Original commit message from CVS: * gst/rtp/gstrtpg726pay.c: (gst_rtp_g726_pay_setcaps): No need to check for audio/G723 and audio/32KADPCM here as they are no longer supported. --- ChangeLog | 6 ++++++ gst/rtp/gstrtpg726pay.c | 14 +------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca92fcf..297e579 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-19 Peter Kjellerstedt + + * gst/rtp/gstrtpg726pay.c: (gst_rtp_g726_pay_setcaps): + No need to check for audio/G723 and audio/32KADPCM here as they are + no longer supported. + 2008-06-19 Sebastian Dröge * ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_reset), diff --git a/gst/rtp/gstrtpg726pay.c b/gst/rtp/gstrtpg726pay.c index c38dacd..d87ee00 100644 --- a/gst/rtp/gstrtpg726pay.c +++ b/gst/rtp/gstrtpg726pay.c @@ -116,15 +116,8 @@ gst_rtp_g726_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps) basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (payload); - if (strcmp ("audio/x-adpcm", stname) == 0) { - if (!gst_structure_get_int (structure, "bitrate", &bitrate)) - bitrate = 32000; - } else if (strcmp ("audio/G723", stname) == 0) { - bitrate = 24000; - } else if (strcmp ("audio/32KADPCM", stname) == 0) { + if (!gst_structure_get_int (structure, "bitrate", &bitrate)) bitrate = 32000; - } else - goto invalid_caps; switch (bitrate) { case 16000: @@ -159,11 +152,6 @@ gst_rtp_g726_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps) return TRUE; /* ERRORS */ -invalid_caps: - { - GST_ERROR_OBJECT (payload, "unknown caps specified"); - return FALSE; - } invalid_bitrate: { GST_ERROR_OBJECT (payload, "invalid bitrate %d specified", bitrate); -- 2.7.4