aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2007-08-24 09:07:34 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2007-08-24 09:07:34 +0000
commitff22edc1ed3cfa66c382b6c5b0a61ff0528a6d22 (patch)
tree5ae1b71b20bae1b01088ad8a09b9475d8b20053e
parent75c896e00f9b6de7843e53eb495657dad59b4370 (diff)
downloadqmmp-ff22edc1ed3cfa66c382b6c5b0a61ff0528a6d22.tar.gz
qmmp-ff22edc1ed3cfa66c382b6c5b0a61ff0528a6d22.tar.bz2
qmmp-ff22edc1ed3cfa66c382b6c5b0a61ff0528a6d22.zip
fixed freezing bug in the ffmpeg plugin
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@123 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--lib/qmmp/Input/ffmpeg/decoder_ffmpeg.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.cpp b/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.cpp
index ac674dcd0..49d3a4d66 100644
--- a/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -50,10 +50,6 @@ DecoderFFmpeg::DecoderFFmpeg(QObject *parent, DecoderFactory *d, QIODevice *i, O
output_size = 0;
ic = 0;
wma_outbuf = 0;
-
-
-
-
}
@@ -331,7 +327,7 @@ void DecoderFFmpeg::ffmpeg_out(int size)
return;
int at = 0;
int to_copy = 0;
- while (size > 0)
+ while (size > 0 && !user_stop)
{
to_copy = qMin(int(globalBufferSize - output_at), int(size) );
memmove ( (char *) (output_buf + output_at), wma_outbuf + at, to_copy);