From db82d2fc8c0ec164e667a713188b2f4d7d63c106 Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Fri, 5 Mar 2004 12:48:57 +0000
Subject: [PATCH] lets SKIP all recorable stream errors

git-svn-id: https://svn.musicpd.org/mpd/trunk@200 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/mp3_decode.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/mp3_decode.c b/src/mp3_decode.c
index 42afdac6a..d169c1394 100644
--- a/src/mp3_decode.c
+++ b/src/mp3_decode.c
@@ -188,8 +188,8 @@ int decodeNextFrameHeader(mp3DecodeData * data) {
 		}
 	}
 	if(mad_header_decode(&data->frame.header,&data->stream)) {
-		if((data->stream).error==MAD_ERROR_LOSTSYNC) {
 #ifdef HAVE_ID3TAG
+		if((data->stream).error==MAD_ERROR_LOSTSYNC) {
 			signed long tagsize = id3_tag_query(
 					(data->stream).this_frame,
 					(data->stream).bufend-
@@ -198,10 +198,9 @@ int decodeNextFrameHeader(mp3DecodeData * data) {
 				mad_stream_skip(&(data->stream),tagsize);
 				return DECODE_CONT;
 			}
-#endif
-			return DECODE_SKIP;
 		}
-		if(MAD_RECOVERABLE((data->stream).error)) return DECODE_CONT;
+#endif
+		if(MAD_RECOVERABLE((data->stream).error)) return DECODE_SKIP;
 		else {
 			if((data->stream).error==MAD_ERROR_BUFLEN) return DECODE_CONT;
 			else
@@ -224,9 +223,9 @@ int decodeNextFrame(mp3DecodeData * data) {
 			return DECODE_BREAK;
 		}
 	}
+#ifdef HAVE_ID3TAG
 	if(mad_frame_decode(&data->frame,&data->stream)) {
 		if((data->stream).error==MAD_ERROR_LOSTSYNC) {
-#ifdef HAVE_ID3TAG
 			signed long tagsize = id3_tag_query(
 					(data->stream).this_frame,
 					(data->stream).bufend-
@@ -235,10 +234,9 @@ int decodeNextFrame(mp3DecodeData * data) {
 				mad_stream_skip(&(data->stream),tagsize);
 				return DECODE_CONT;
 			}
-#endif
-			return DECODE_SKIP;
 		}
-		if(MAD_RECOVERABLE((data->stream).error)) return DECODE_CONT;
+#endif
+		if(MAD_RECOVERABLE((data->stream).error)) return DECODE_SKIP;
 		else {
 			if((data->stream).error==MAD_ERROR_BUFLEN) return DECODE_CONT;
 			else