From 838e10c219faf33022c241d09acc74bd674e35e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 17 May 2008 14:05:03 +0000 Subject: gst/interleave/deinterleave.c: Always set the channel positions when gst_audio_get_channel_positions() returns someth... Original commit message from CVS: * gst/interleave/deinterleave.c: (gst_deinterleave_sink_setcaps), (gst_deinterleave_getcaps): Always set the channel positions when gst_audio_get_channel_positions() returns something, even if they're not set in the caps. This makes sure that the output channels can be interleaved again correctly in the mono/stereo cases too. Don't ask for the peercaps of the current pad in getcaps() as this might call getcaps() again and deadlock. --- ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 0646e83f..e866440a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-05-17 Sebastian Dröge + + * gst/interleave/deinterleave.c: (gst_deinterleave_sink_setcaps), + (gst_deinterleave_getcaps): + Always set the channel positions when gst_audio_get_channel_positions() + returns something, even if they're not set in the caps. This makes + sure that the output channels can be interleaved again correctly + in the mono/stereo cases too. + + Don't ask for the peercaps of the current pad in getcaps() as this + might call getcaps() again and deadlock. + 2008-05-16 Sebastian Dröge * ext/timidity/gstwildmidi.c: (wildmidi_open_config): -- cgit v1.2.1