diff options
| author | Jens Granseuer <jensgr@gmx.net> | 2007-06-22 20:23:18 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-08-11 02:30:28 +0100 |
| commit | 31571c8cb2c943ca135b7257df80b04ef5c1edee (patch) | |
| tree | 504663e0d5d277ce229bbf0e52a7848d62297434 | |
| parent | 0c4fe985b638ee046102e328b66b087d64f68679 (diff) | |
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.
| -rw-r--r-- | gst/rtpmanager/async_jitter_queue.c | 3 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpjitterbuffer.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gst/rtpmanager/async_jitter_queue.c b/gst/rtpmanager/async_jitter_queue.c index 77980c98c..73597b28e 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 33f78741c..d33d17ae2 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); |