aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-05-20 04:36:25 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-05-20 04:36:25 +0000
commit1b1d79d22a9513f796f0f5e80c01ab47ab482138 (patch)
treed41346b84e5c932349ae66e58a415937241c0772 /src
parent0b051094166ad33184100f229931ea0f6f21e176 (diff)
downloadmpd-1b1d79d22a9513f796f0f5e80c01ab47ab482138.tar.gz
mpd-1b1d79d22a9513f796f0f5e80c01ab47ab482138.tar.xz
mpd-1b1d79d22a9513f796f0f5e80c01ab47ab482138.zip
oops another bug fix for handling stop in decodeFirstFrame (mp3)
git-svn-id: https://svn.musicpd.org/mpd/trunk@1109 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src')
-rw-r--r--src/mp3_decode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mp3_decode.c b/src/mp3_decode.c
index 3223e3360..9fd67ca1a 100644
--- a/src/mp3_decode.c
+++ b/src/mp3_decode.c
@@ -348,10 +348,10 @@ int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc) {
while((ret = decodeNextFrameHeader(data))==DECODE_CONT &&
(!dc || !dc->stop));
if(ret==DECODE_SKIP) skip = 1;
- else if(ret==DECODE_BREAK) return -1;
+ else if(ret==DECODE_BREAK || dc->stop) return -1;
while((ret = decodeNextFrame(data))==DECODE_CONT &&
(!dc || !dc->stop));
- if(ret==DECODE_BREAK) return -1;
+ if(ret==DECODE_BREAK || dc->stop) return -1;
if(!skip && ret==DECODE_OK) break;
}