From fdc7b73675d9c135813971efce8cf084ef1cb114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 15 Mar 2010 14:16:58 +0100
Subject: [PATCH] speexdec: Use speex_stereo_state_init() instead of the
 deprecated initialization macro

Fixes bug #612777.
---
 ext/speex/gstspeexdec.c | 12 +++++++++---
 ext/speex/gstspeexdec.h |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c
index c59e1c7be7..12b8cc46f8 100644
--- a/ext/speex/gstspeexdec.c
+++ b/ext/speex/gstspeexdec.c
@@ -151,6 +151,12 @@ gst_speex_dec_reset (GstSpeexDec * dec)
   free (dec->header);
   dec->header = NULL;
   speex_bits_destroy (&dec->bits);
+
+  if (dec->stereo) {
+    speex_stereo_state_destroy (dec->stereo);
+    dec->stereo = NULL;
+  }
+
   if (dec->state) {
     speex_decoder_destroy (dec->state);
     dec->state = NULL;
@@ -532,10 +538,10 @@ speex_dec_chain_parse_header (GstSpeexDec * dec, GstBuffer * buf)
   speex_decoder_ctl (dec->state, SPEEX_GET_FRAME_SIZE, &dec->frame_size);
 
   if (dec->header->nb_channels != 1) {
+    dec->stereo = speex_stereo_state_init ();
     dec->callback.callback_id = SPEEX_INBAND_STEREO;
     dec->callback.func = speex_std_stereo_request_handler;
-    dec->callback.data = &dec->stereo;
-    dec->stereo = (SpeexStereoState) SPEEX_STEREO_STATE_INIT;
+    dec->callback.data = dec->stereo;
     speex_decoder_ctl (dec->state, SPEEX_SET_HANDLER, &dec->callback);
   }
 
@@ -713,7 +719,7 @@ speex_dec_chain_parse_data (GstSpeexDec * dec, GstBuffer * buf,
       break;
     }
     if (dec->header->nb_channels == 2)
-      speex_decode_stereo_int (out_data, dec->frame_size, &dec->stereo);
+      speex_decode_stereo_int (out_data, dec->frame_size, dec->stereo);
 
     GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
     GST_BUFFER_DURATION (outbuf) = dec->frame_duration;
diff --git a/ext/speex/gstspeexdec.h b/ext/speex/gstspeexdec.h
index 3b8660b1b4..c1498dccc1 100644
--- a/ext/speex/gstspeexdec.h
+++ b/ext/speex/gstspeexdec.h
@@ -53,7 +53,7 @@ struct _GstSpeexDec {
   GstPad                *srcpad;
 
   void                  *state;
-  SpeexStereoState      stereo;
+  SpeexStereoState      *stereo;
 #ifdef SPEEX_1_0
   SpeexMode             *mode;
 #else