summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-02 22:35:57 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-02 22:35:57 +0000
commita251dc779c6eaf0d29b126b02877fc10838aaec0 (patch)
tree364c90119fea42cd28016305b7768696243dc680 /src/combined
parent852aff94b4586982ff33bf21471cda90124a65bf (diff)
parentefaeb575230625611f3f5fc1f9eae2b36d375fea (diff)
downloadxine-lib-a251dc779c6eaf0d29b126b02877fc10838aaec0.tar.gz
xine-lib-a251dc779c6eaf0d29b126b02877fc10838aaec0.tar.bz2
Merge from 1.1.
--HG-- rename : include/xine.h.in => include/xine.h rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/ffmpeg/ff_audio_decoder.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
index e12778fc7..a3c61b097 100644
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -366,6 +366,11 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
/* dispatch the decoded audio */
out = 0;
while (out < decode_buffer_size) {
+ int stream_status = xine_get_status(this->stream);
+
+ if (stream_status == XINE_STATUS_QUIT || stream_status == XINE_STATUS_STOP)
+ return;
+
audio_buffer =
this->stream->audio_out->get_buffer (this->stream->audio_out);
if (audio_buffer->mem_size == 0) {