summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-06-18 16:55:05 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-06-18 16:55:05 +0000
commit54f515d2c8e3b6f7a2f6460613ff9e087aca0a6d (patch)
tree0878a60c2e6a843073aaca7766291012f7f7b58f
parent6cf110c1e38db7612df9e86bad61e23471107477 (diff)
gst/rtp/gstrtpg726pay.c: Fix caps, See #538891.
Original commit message from CVS: * gst/rtp/gstrtpg726pay.c: Fix caps, See #538891.
-rw-r--r--ChangeLog5
-rw-r--r--gst/rtp/gstrtpg726pay.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 94ece967..91740c63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-18 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/rtp/gstrtpg726pay.c:
+ Fix caps, See #538891.
+
2008-06-18 Sebastian Dröge <slomo@circular-chaos.org>
* gst/matroska/matroska-demux.c: (gst_matroska_demux_reset),
diff --git a/gst/rtp/gstrtpg726pay.c b/gst/rtp/gstrtpg726pay.c
index 59af7ab3..c38dacd2 100644
--- a/gst/rtp/gstrtpg726pay.c
+++ b/gst/rtp/gstrtpg726pay.c
@@ -37,16 +37,14 @@ GST_ELEMENT_DETAILS ("RTP packet payloader",
"Axis Communications <dev-gstreamer@axis.com>");
static GstStaticPadTemplate gst_rtp_g726_pay_sink_template =
- GST_STATIC_PAD_TEMPLATE ("sink",
+GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-adpcm, "
"channels = (int) 1, "
"rate = (int) 8000, "
"bitrate = (int) { 16000, 24000, 32000, 40000 }, "
- "layout = (string) \"g726\"; "
- "audio/G723, channels=(int)1, rate=(int)8000; "
- "audio/32KADPCM, channels=(int)1, rate=(int)8000")
+ "layout = (string) \"g726\"")
);
static GstStaticPadTemplate gst_rtp_g726_pay_src_template =