From b19b914d3a34ebeadfac9d65de4eecdb719f08e4 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sun, 12 Aug 2012 13:16:32 +0200 Subject: [PATCH] law: Filter layout caps field The layout caps field shouldn't be passed through to the sink pad of {mu,a}lawdec. https://bugzilla.gnome.org/show_bug.cgi?id=681677 --- gst/law/alaw-decode.c | 4 ++-- gst/law/mulaw-decode.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c index a586ffd..7b5d936 100644 --- a/gst/law/alaw-decode.c +++ b/gst/law/alaw-decode.c @@ -185,11 +185,11 @@ gst_alaw_dec_getcaps (GstPad * pad, GstCaps * filter) if (pad == alawdec->sinkpad) { /* remove the fields we don't want */ - gst_structure_remove_fields (structure, "format", NULL); + gst_structure_remove_fields (structure, "format", "layout", NULL); } else { /* add fixed fields */ gst_structure_set (structure, "format", G_TYPE_STRING, - GST_AUDIO_NE (S16), NULL); + GST_AUDIO_NE (S16), "layout", G_TYPE_STRING, "interleaved", NULL); } } /* filter against the allowed caps of the pad to return our result */ diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c index bc24538..ba0d4f9 100644 --- a/gst/law/mulaw-decode.c +++ b/gst/law/mulaw-decode.c @@ -126,11 +126,11 @@ mulawdec_getcaps (GstPad * pad, GstCaps * filter) if (pad == mulawdec->sinkpad) { /* remove the fields we don't want */ - gst_structure_remove_fields (structure, "format", NULL); + gst_structure_remove_fields (structure, "format", "layout", NULL); } else { /* add fixed fields */ gst_structure_set (structure, "format", G_TYPE_STRING, - GST_AUDIO_NE (S16), NULL); + GST_AUDIO_NE (S16), "layout", G_TYPE_STRING, "interleaved", NULL); } } /* filter against the allowed caps of the pad to return our result */ -- 2.7.4