Fix infinite loop on garbage data at the beginning of AAC files

FFMS · Dec 10, 2013 · 57ae962 · 57ae962
1 parent 1a11397
commit 57ae962
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/audiosource.cpp b/src/core/audiosource.cpp
@@ -314,10 +314,10 @@ void FFMS_AudioSource::DecodeNextBlock(CacheIterator *pos) {
 		// during indexing, so continue to just ignore decoding errors
 		if (Ret < 0) break;
 
-		if (Ret > 0 && GotFrame) {
+		if (Ret > 0) {
 			Packet.size -= Ret;
 			Packet.data += Ret;
-			if (DecodeFrame->nb_samples > 0) {
+			if (GotFrame && DecodeFrame->nb_samples > 0) {
 				GotSamples = true;
 				if (pos)
 					CacheBlock(*pos);