Commit 28e29a29 authored by Warren Dukes's avatar Warren Dukes

fix a bug in decodeFirstFrame when just decoding tags and not passing

a DecoderControl git-svn-id: https://svn.musicpd.org/mpd/trunk@1126 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 547e3587
...@@ -347,10 +347,10 @@ int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc) { ...@@ -347,10 +347,10 @@ int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc) {
while((ret = decodeNextFrameHeader(data))==DECODE_CONT && while((ret = decodeNextFrameHeader(data))==DECODE_CONT &&
(!dc || !dc->stop)); (!dc || !dc->stop));
if(ret==DECODE_SKIP) skip = 1; if(ret==DECODE_SKIP) skip = 1;
else if(ret==DECODE_BREAK || dc->stop) return -1; else if(ret==DECODE_BREAK || (dc && dc->stop)) return -1;
while((ret = decodeNextFrame(data))==DECODE_CONT && while((ret = decodeNextFrame(data))==DECODE_CONT &&
(!dc || !dc->stop)); (!dc || !dc->stop));
if(ret==DECODE_BREAK || dc->stop) return -1; if(ret==DECODE_BREAK || (dc && dc->stop)) return -1;
if(!skip && ret==DECODE_OK) break; if(!skip && ret==DECODE_OK) break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment