summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Kretz <kretz@kde.org>2007-12-04 00:43:27 +0100
committerMatthias Kretz <kretz@kde.org>2007-12-04 00:43:27 +0100
commit0aa00fb217357cee4ef1008677e1247bb24eb42c (patch)
treee0fd7c2a6a1470e57d8fa0ea66e72ac89bc1d15c
parentb312cde90d985df949beac9708476af28bc82113 (diff)
downloadxine-lib-0aa00fb217357cee4ef1008677e1247bb24eb42c.tar.gz
xine-lib-0aa00fb217357cee4ef1008677e1247bb24eb42c.tar.bz2
fifo_peek_int can return NULL (when non-blocking). make fifo_remove_int handle that case
-rw-r--r--src/xine-engine/audio_out.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 7519c3067..7fe92d9fe 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -358,6 +358,8 @@ static audio_buffer_t *fifo_peek_int (audio_fifo_t *fifo, int blocking) {
static audio_buffer_t *fifo_remove_int (audio_fifo_t *fifo, int blocking) {
audio_buffer_t *buf = fifo_peek_int(fifo, blocking);
+ if (!buf)
+ return NULL;
fifo->first = buf->next;