From f9cf10c74816d3ca02aab584464fba06d733c21d Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@gnome.org>
Date: Sun, 13 Feb 2005 16:10:16 +0000
Subject: [PATCH] gst/audioconvert/gstchannelmix.h: include missing header file

Original commit message from CVS:
* gst/audioconvert/gstchannelmix.h:
include missing header file
* gst/audioconvert/gstchannelmix.c:
(gst_audio_convert_fill_compatible):
use same sign for both channels when converting to/from compatible
channel. Previously used different signs made the signals cancel
each other out and appear like silence. (fixes #167269)
---
 ChangeLog                        | 10 ++++++++++
 gst/audioconvert/gstchannelmix.c |  4 ++--
 gst/audioconvert/gstchannelmix.h |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd69df3776..1e30fa3a32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-02-13  Benjamin Otte  <otte@gnome.org>
+
+	* gst/audioconvert/gstchannelmix.h:
+	  include missing header file
+	* gst/audioconvert/gstchannelmix.c:
+	(gst_audio_convert_fill_compatible):
+	  use same sign for both channels when converting to/from compatible
+	  channel. Previously used different signs made the signals cancel
+	  each other out and appear like silence. (fixes #167269)
+
 2005-02-12  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/ffmpegcolorspace/avcodec.h:
diff --git a/gst/audioconvert/gstchannelmix.c b/gst/audioconvert/gstchannelmix.c
index a7563dfff1..53749a21e9 100644
--- a/gst/audioconvert/gstchannelmix.c
+++ b/gst/audioconvert/gstchannelmix.c
@@ -140,7 +140,7 @@ gst_audio_convert_fill_compatible (GstAudioConvert * this)
     }
 
     if (pos1_0 != -1 && pos1_1 != -1 && pos2_0 != -1) {
-      this->matrix[pos1_0][pos2_0] = -1.0;
+      this->matrix[pos1_0][pos2_0] = 1.0;
       this->matrix[pos1_1][pos2_0] = 1.0;
     }
 
@@ -161,7 +161,7 @@ gst_audio_convert_fill_compatible (GstAudioConvert * this)
     }
 
     if (pos1_0 != -1 && pos1_1 != -1 && pos2_0 != -1) {
-      this->matrix[pos2_0][pos1_0] = -1.0;
+      this->matrix[pos2_0][pos1_0] = 1.0;
       this->matrix[pos2_0][pos1_1] = 1.0;
     }
   }
diff --git a/gst/audioconvert/gstchannelmix.h b/gst/audioconvert/gstchannelmix.h
index 28d5082da9..08a9c18377 100644
--- a/gst/audioconvert/gstchannelmix.h
+++ b/gst/audioconvert/gstchannelmix.h
@@ -23,6 +23,7 @@
 #define __GST_CHANNEL_MIX_H__
 
 #include <gst/gst.h>
+#include <gst/audio/multichannel.h>
 
 #define GST_TYPE_AUDIO_CONVERT          (gst_audio_convert_get_type())
 #define GST_AUDIO_CONVERT(obj)          (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_CONVERT,GstAudioConvert))