gst/: Build fixes for gcc-2.9x (no mid-block variable declarations etc.).

Original commit message from CVS:
Patch by: Jens Granseuer  <jensgr at gmx net>
* gst/equalizer/gstiirequalizer.c:
* gst/equalizer/gstiirequalizer10bands.c:
* gst/equalizer/gstiirequalizer3bands.c:
* gst/equalizer/gstiirequalizernbands.c:
* gst/rtpmanager/async_jitter_queue.c:
(async_jitter_queue_push_sorted):
* gst/rtpmanager/gstrtpjitterbuffer.c:
(gst_rtp_jitter_buffer_chain):
* gst/switch/gstswitch.c: (gst_switch_chain):
Build fixes for gcc-2.9x (no mid-block variable declarations etc.).
Fixes #450185.

8 files changed, 29 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index f8f11120..93af28c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-06-22  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Jens Granseuer  <jensgr at gmx net>
+
+	* gst/equalizer/gstiirequalizer.c:
+	* gst/equalizer/gstiirequalizer10bands.c:
+	* gst/equalizer/gstiirequalizer3bands.c:
+	* gst/equalizer/gstiirequalizernbands.c:
+	* gst/rtpmanager/async_jitter_queue.c:
+	(async_jitter_queue_push_sorted):
+	* gst/rtpmanager/gstrtpjitterbuffer.c:
+	(gst_rtp_jitter_buffer_chain):
+	* gst/switch/gstswitch.c: (gst_switch_chain):
+	  Build fixes for gcc-2.9x (no mid-block variable declarations etc.).
+	  Fixes #450185.
+
 2007-06-22  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* examples/switch/switcher.c (my_bus_callback, switch_timer,
diff --git a/gst/equalizer/gstiirequalizer.c b/gst/equalizer/gstiirequalizer.c
index ff11c9e7..1bb240e9 100644
--- a/gst/equalizer/gstiirequalizer.c
+++ b/gst/equalizer/gstiirequalizer.c
@@ -53,7 +53,7 @@ static gboolean gst_iir_equalizer_setup (GstAudioFilter * filter,
 static GstFlowReturn gst_iir_equalizer_transform_ip (GstBaseTransform * btrans,
     GstBuffer * buf);
 
-GST_DEBUG_CATEGORY_EXTERN ()(equalizer_debug);
+GST_DEBUG_CATEGORY_EXTERN (equalizer_debug);
 #define GST_CAT_DEFAULT equalizer_debug
 
 #define ALLOWED_CAPS \
diff --git a/gst/equalizer/gstiirequalizer10bands.c b/gst/equalizer/gstiirequalizer10bands.c
index 417f2943..fb599d7e 100644
--- a/gst/equalizer/gstiirequalizer10bands.c
+++ b/gst/equalizer/gstiirequalizer10bands.c
@@ -66,7 +66,7 @@ static void gst_iir_equalizer_10bands_set_property (GObject * object,
 static void gst_iir_equalizer_10bands_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
-GST_DEBUG_CATEGORY_EXTERN ()(equalizer_debug);
+GST_DEBUG_CATEGORY_EXTERN (equalizer_debug);
 #define GST_CAT_DEFAULT equalizer_debug
 
 GST_BOILERPLATE (GstIirEqualizer10Bands, gst_iir_equalizer_10bands,
diff --git a/gst/equalizer/gstiirequalizer3bands.c b/gst/equalizer/gstiirequalizer3bands.c
index aa9a98b2..17e7b553 100644
--- a/gst/equalizer/gstiirequalizer3bands.c
+++ b/gst/equalizer/gstiirequalizer3bands.c
@@ -54,7 +54,7 @@ static void gst_iir_equalizer_3bands_set_property (GObject * object,
 static void gst_iir_equalizer_3bands_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
-GST_DEBUG_CATEGORY_EXTERN ()(equalizer_debug);
+GST_DEBUG_CATEGORY_EXTERN (equalizer_debug);
 #define GST_CAT_DEFAULT equalizer_debug
 
 GST_BOILERPLATE (GstIirEqualizer3Bands, gst_iir_equalizer_3bands,
diff --git a/gst/equalizer/gstiirequalizernbands.c b/gst/equalizer/gstiirequalizernbands.c
index c03ca01f..788dded8 100644
--- a/gst/equalizer/gstiirequalizernbands.c
+++ b/gst/equalizer/gstiirequalizernbands.c
@@ -53,7 +53,7 @@ static void gst_iir_equalizer_nbands_set_property (GObject * object,
 static void gst_iir_equalizer_nbands_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
-GST_DEBUG_CATEGORY_EXTERN ()(equalizer_debug);
+GST_DEBUG_CATEGORY_EXTERN (equalizer_debug);
 #define GST_CAT_DEFAULT equalizer_debug
 
 GST_BOILERPLATE (GstIirEqualizerNBands, gst_iir_equalizer_nbands,
diff --git a/gst/rtpmanager/async_jitter_queue.c b/gst/rtpmanager/async_jitter_queue.c
index 77980c98..73597b28 100644
--- a/gst/rtpmanager/async_jitter_queue.c
+++ b/gst/rtpmanager/async_jitter_queue.c
@@ -396,9 +396,10 @@ gboolean
 async_jitter_queue_push_sorted (AsyncJitterQueue * queue,
     gpointer data, GCompareDataFunc func, gpointer user_data)
 {
-  g_return_val_if_fail (queue != NULL, FALSE);
   gboolean ret;
 
+  g_return_val_if_fail (queue != NULL, FALSE);
+
   g_mutex_lock (queue->mutex);
   ret = async_jitter_queue_push_sorted_unlocked (queue, data, func, user_data);
   g_mutex_unlock (queue->mutex);
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c
index 33f78741..d33d17ae 100644
--- a/gst/rtpmanager/gstrtpjitterbuffer.c
+++ b/gst/rtpmanager/gstrtpjitterbuffer.c
@@ -819,9 +819,10 @@ gst_rtp_jitter_buffer_chain (GstPad * pad, GstBuffer * buffer)
   if (priv->drop_on_latency) {
     if (async_jitter_queue_length_ts_units_unlocked (priv->queue) >=
         priv->latency_ms * priv->clock_rate / 1000) {
+      GstBuffer *old_buf;
+
       GST_DEBUG_OBJECT (jitterbuffer, "Queue full, dropping old packet #%d",
           seqnum);
-      GstBuffer *old_buf;
 
       old_buf = async_jitter_queue_pop_unlocked (priv->queue);
       gst_buffer_unref (old_buf);
diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c
index a7a20f85..5f9dd054 100644
--- a/gst/switch/gstswitch.c
+++ b/gst/switch/gstswitch.c
@@ -222,6 +222,9 @@ gst_switch_chain (GstPad * pad, GstBuffer * buf)
 
   /* check if we need to send a new segment event */
   if (gstswitch->need_to_send_newsegment && !gstswitch->queue_buffers) {
+    GstEvent *event;
+    GList *buffers;
+
     /* check to see if we need to send a new segment update for stop */
     if (gstswitch->previous_sinkpad != NULL) {
       if (gstswitch->stop_value != GST_CLOCK_TIME_NONE) {
@@ -252,7 +255,7 @@ gst_switch_chain (GstPad * pad, GstBuffer * buf)
       gstswitch->previous_sinkpad = NULL;
     }
     /* retrieve event from hash table */
-    GstEvent *event =
+    event =
         (GstEvent *) g_hash_table_lookup (gstswitch->newsegment_events, pad);
     if (event) {
       /* create a copy of this event so we can change start to match
@@ -285,8 +288,7 @@ gst_switch_chain (GstPad * pad, GstBuffer * buf)
     gstswitch->start_value = GST_CLOCK_TIME_NONE;
     gstswitch->stop_value = GST_CLOCK_TIME_NONE;
     /* send all the stored buffers if any */
-    GList *buffers =
-        g_hash_table_lookup (gstswitch->stored_buffers, active_sinkpad);
+    buffers = g_hash_table_lookup (gstswitch->stored_buffers, active_sinkpad);
     while (buffers != NULL) {
       gst_buffer_ref (GST_BUFFER (buffers->data));
       GST_SWITCH_UNLOCK (gstswitch);