gst/interleave/deinterleave.c: Remove 'channel-positions' field when munging input caps into 1-channel output caps (I...

Original commit message from CVS:
* gst/interleave/deinterleave.c: (gst_deinterleave_sink_setcaps):
Remove 'channel-positions' field when munging input caps into
1-channel output caps (I guess technically we should set the
position for each channel on the output caps if it's non-NONE,
but I'll save that as a task for another day).

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b7b2d31c..d54927ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-24  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/interleave/deinterleave.c: (gst_deinterleave_sink_setcaps):
+	  Remove 'channel-positions' field when munging input caps into
+	  1-channel output caps (I guess technically we should set the
+	  position for each channel on the output caps if it's non-NONE,
+	  but I'll save that as a task for another day).
+
 2007-03-23  Michael Smith  <msmith@fluendo.com>
 
 	* gst/vmnc/vmncdec.c: (gst_vmnc_dec_class_init),
diff --git a/gst/interleave/deinterleave.c b/gst/interleave/deinterleave.c
index 7b2b5311..81bf9387 100644
--- a/gst/interleave/deinterleave.c
+++ b/gst/interleave/deinterleave.c
@@ -198,6 +198,7 @@ gst_deinterleave_sink_setcaps (GstPad * pad, GstCaps * caps)
     if (!gst_structure_get_int (s, "channels", &self->channels))
       goto no_channels;
     gst_structure_set (s, "channels", G_TYPE_INT, 1, NULL);
+    gst_structure_remove_field (s, "channel-positions");
     gst_deinterleave_add_new_pads (self, srccaps);
     gst_caps_unref (srccaps);
   }