diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-02-10 18:25:09 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-02-10 18:25:09 +0000 |
| commit | 1c19b8e8e3cfb32e341332b751686e86d7389569 (patch) | |
| tree | 64d9edcf312915b3d9ae524d55b6508b61bf361f /src/combined | |
| parent | c62b455944c8c91bd4d9ae5e8000ec33190174c5 (diff) | |
| parent | 6002a9a87b3f591832c2b91ca1b2b1b67be008f5 (diff) | |
| download | xine-lib-1c19b8e8e3cfb32e341332b751686e86d7389569.tar.gz xine-lib-1c19b8e8e3cfb32e341332b751686e86d7389569.tar.bz2 | |
Merge from 1.1.
--HG--
rename : doc/faq/faq.sgml => doc/faq/faq.docbook
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
Diffstat (limited to 'src/combined')
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 893e405b1..bae0f92a4 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -332,8 +332,10 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) while (out < decode_buffer_size) { int stream_status = xine_get_status(this->stream); - if (stream_status == XINE_STATUS_QUIT || stream_status == XINE_STATUS_STOP) + if (stream_status == XINE_STATUS_QUIT || stream_status == XINE_STATUS_STOP) { + this->size = 0; return; + } audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out); |