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.
This commit is contained in:
Jens Granseuer 2007-06-22 20:23:18 +00:00 committed by Tim-Philipp Müller
parent d6627ae8e0
commit f45e98fab4
8 changed files with 29 additions and 9 deletions

View file

@ -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> 2007-06-22 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* examples/switch/switcher.c (my_bus_callback, switch_timer, * examples/switch/switcher.c (my_bus_callback, switch_timer,

View file

@ -53,7 +53,7 @@ static gboolean gst_iir_equalizer_setup (GstAudioFilter * filter,
static GstFlowReturn gst_iir_equalizer_transform_ip (GstBaseTransform * btrans, static GstFlowReturn gst_iir_equalizer_transform_ip (GstBaseTransform * btrans,
GstBuffer * buf); GstBuffer * buf);
GST_DEBUG_CATEGORY_EXTERN ()(equalizer_debug); GST_DEBUG_CATEGORY_EXTERN (equalizer_debug);
#define GST_CAT_DEFAULT equalizer_debug #define GST_CAT_DEFAULT equalizer_debug
#define ALLOWED_CAPS \ #define ALLOWED_CAPS \

View file

@ -66,7 +66,7 @@ static void gst_iir_equalizer_10bands_set_property (GObject * object,
static void gst_iir_equalizer_10bands_get_property (GObject * object, static void gst_iir_equalizer_10bands_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); 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 #define GST_CAT_DEFAULT equalizer_debug
GST_BOILERPLATE (GstIirEqualizer10Bands, gst_iir_equalizer_10bands, GST_BOILERPLATE (GstIirEqualizer10Bands, gst_iir_equalizer_10bands,

View file

@ -54,7 +54,7 @@ static void gst_iir_equalizer_3bands_set_property (GObject * object,
static void gst_iir_equalizer_3bands_get_property (GObject * object, static void gst_iir_equalizer_3bands_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); 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 #define GST_CAT_DEFAULT equalizer_debug
GST_BOILERPLATE (GstIirEqualizer3Bands, gst_iir_equalizer_3bands, GST_BOILERPLATE (GstIirEqualizer3Bands, gst_iir_equalizer_3bands,

View file

@ -53,7 +53,7 @@ static void gst_iir_equalizer_nbands_set_property (GObject * object,
static void gst_iir_equalizer_nbands_get_property (GObject * object, static void gst_iir_equalizer_nbands_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); 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 #define GST_CAT_DEFAULT equalizer_debug
GST_BOILERPLATE (GstIirEqualizerNBands, gst_iir_equalizer_nbands, GST_BOILERPLATE (GstIirEqualizerNBands, gst_iir_equalizer_nbands,

View file

@ -396,9 +396,10 @@ gboolean
async_jitter_queue_push_sorted (AsyncJitterQueue * queue, async_jitter_queue_push_sorted (AsyncJitterQueue * queue,
gpointer data, GCompareDataFunc func, gpointer user_data) gpointer data, GCompareDataFunc func, gpointer user_data)
{ {
g_return_val_if_fail (queue != NULL, FALSE);
gboolean ret; gboolean ret;
g_return_val_if_fail (queue != NULL, FALSE);
g_mutex_lock (queue->mutex); g_mutex_lock (queue->mutex);
ret = async_jitter_queue_push_sorted_unlocked (queue, data, func, user_data); ret = async_jitter_queue_push_sorted_unlocked (queue, data, func, user_data);
g_mutex_unlock (queue->mutex); g_mutex_unlock (queue->mutex);

View file

@ -819,9 +819,10 @@ gst_rtp_jitter_buffer_chain (GstPad * pad, GstBuffer * buffer)
if (priv->drop_on_latency) { if (priv->drop_on_latency) {
if (async_jitter_queue_length_ts_units_unlocked (priv->queue) >= if (async_jitter_queue_length_ts_units_unlocked (priv->queue) >=
priv->latency_ms * priv->clock_rate / 1000) { priv->latency_ms * priv->clock_rate / 1000) {
GstBuffer *old_buf;
GST_DEBUG_OBJECT (jitterbuffer, "Queue full, dropping old packet #%d", GST_DEBUG_OBJECT (jitterbuffer, "Queue full, dropping old packet #%d",
seqnum); seqnum);
GstBuffer *old_buf;
old_buf = async_jitter_queue_pop_unlocked (priv->queue); old_buf = async_jitter_queue_pop_unlocked (priv->queue);
gst_buffer_unref (old_buf); gst_buffer_unref (old_buf);

View file

@ -222,6 +222,9 @@ gst_switch_chain (GstPad * pad, GstBuffer * buf)
/* check if we need to send a new segment event */ /* check if we need to send a new segment event */
if (gstswitch->need_to_send_newsegment && !gstswitch->queue_buffers) { 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 */ /* check to see if we need to send a new segment update for stop */
if (gstswitch->previous_sinkpad != NULL) { if (gstswitch->previous_sinkpad != NULL) {
if (gstswitch->stop_value != GST_CLOCK_TIME_NONE) { if (gstswitch->stop_value != GST_CLOCK_TIME_NONE) {
@ -252,7 +255,7 @@ gst_switch_chain (GstPad * pad, GstBuffer * buf)
gstswitch->previous_sinkpad = NULL; gstswitch->previous_sinkpad = NULL;
} }
/* retrieve event from hash table */ /* retrieve event from hash table */
GstEvent *event = event =
(GstEvent *) g_hash_table_lookup (gstswitch->newsegment_events, pad); (GstEvent *) g_hash_table_lookup (gstswitch->newsegment_events, pad);
if (event) { if (event) {
/* create a copy of this event so we can change start to match /* 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->start_value = GST_CLOCK_TIME_NONE;
gstswitch->stop_value = GST_CLOCK_TIME_NONE; gstswitch->stop_value = GST_CLOCK_TIME_NONE;
/* send all the stored buffers if any */ /* send all the stored buffers if any */
GList *buffers = buffers = g_hash_table_lookup (gstswitch->stored_buffers, active_sinkpad);
g_hash_table_lookup (gstswitch->stored_buffers, active_sinkpad);
while (buffers != NULL) { while (buffers != NULL) {
gst_buffer_ref (GST_BUFFER (buffers->data)); gst_buffer_ref (GST_BUFFER (buffers->data));
GST_SWITCH_UNLOCK (gstswitch); GST_SWITCH_UNLOCK (gstswitch);