gst/audioconvert/gstaudioconvert.c: Fix logic in last commit.

Original commit message from CVS:
* gst/audioconvert/gstaudioconvert.c:
(gst_audio_convert_fixate_channels):
Fix logic in last commit.

diff --git a/ChangeLog b/ChangeLog
index 671b701..1cd9e0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
        * gst/audioconvert/gstaudioconvert.c:
        (gst_audio_convert_fixate_channels):
+       Fix logic in last commit.
+
+2008-05-20  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       * gst/audioconvert/gstaudioconvert.c:
+       (gst_audio_convert_fixate_channels):
        Passthrough the channel positions if the number of output channels is
        the same as the number of input channels, the input had a channel
        layout and downstream requests no special one. We did this already for

diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 970be60..fa4eed2 100644 (file)
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -848,7 +848,7 @@ gst_audio_convert_fixate_channels (GstBaseTransform * base, GstStructure * ins,
   in_layout = gst_structure_get_value (ins, "channel-positions");
 
   if (out_layout == NULL) {
-    if (out_chans <= 2 && in_chans != out_chans && in_layout == NULL)
+    if (out_chans <= 2 && (in_chans != out_chans || in_layout == NULL))
       return;                   /* nothing to do, default layout will be assumed */
     GST_WARNING_OBJECT (base, "downstream caps contain no channel layout");
   }