2 files changed, 10 insertions, 17 deletions
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index dd255903a..7cff31d40 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -288,7 +288,6 @@ static int aac_decode(char *path)
 	long bread;
 	uint32_t sampleRate;
 	unsigned char channels;
-	int eof = 0;
 	unsigned int sampleCount;
 	char *sampleBuffer;
 	size_t sampleBufferLen;
@@ -342,13 +341,12 @@ static int aac_decode(char *path)
 
 	advanceAacBuffer(&b, bread);
 
-	while (!eof) {
+	while (1) {
 		fillAacBuffer(&b);
 
-		if (b.bytesIntoBuffer == 0) {
-			eof = 1;
+		if (b.bytesIntoBuffer == 0)
 			break;
-		}
+
 #ifdef HAVE_FAAD_BUFLEN_FUNCS
 		sampleBuffer = faacDecDecode(decoder, &frameInfo, b.buffer,
 					     b.bytesIntoBuffer);
@@ -360,7 +358,6 @@ static int aac_decode(char *path)
 			ERROR("error decoding AAC file: %s\n", path);
 			ERROR("faad2 error: %s\n",
 			      faacDecGetErrorMessage(frameInfo.error));
-			eof = 1;
 			break;
 		}
 #ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE
@@ -395,9 +392,10 @@ static int aac_decode(char *path)
 			 */
 			dc_action_seek_fail(DC_SEEK_ERROR);
 			break;
-		default: eof = 1;
+		default: goto out;
 		}
 	}
+out:
 
 	faacDecClose(decoder);
 	if (b.buffer)
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c
index 66dbbfdba..8e3d02354 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -94,7 +94,6 @@ static int mp4_decode(InputStream * inStream)
 	unsigned char channels;
 	long sampleId;
 	long numSamples;
-	int eof = 0;
 	long dur;
 	unsigned int sampleCount;
 	char *sampleBuffer;
@@ -177,7 +176,7 @@ static int mp4_decode(InputStream * inStream)
 
 	seekTable = xmalloc(sizeof(float) * numSamples);
 
-	for (sampleId = 0; sampleId < numSamples && !eof; sampleId++) {
+	for (sampleId = 0; sampleId < numSamples; sampleId++) {
 		if (!seeking && dc_seek()) {
 			dc_action_begin();
 			assert(dc.action == DC_ACTION_SEEK);
@@ -223,10 +222,9 @@ static int mp4_decode(InputStream * inStream)
 			continue;
 
 		if (mp4ff_read_sample(mp4fh, track, sampleId, &mp4Buffer,
-				      &mp4BufferSize) == 0) {
-			eof = 1;
-			continue;
-		}
+				      &mp4BufferSize) == 0)
+			break;
+
 #ifdef HAVE_FAAD_BUFLEN_FUNCS
 		sampleBuffer = faacDecDecode(decoder, &frameInfo, mp4Buffer,
 					     mp4BufferSize);
@@ -239,7 +237,6 @@ static int mp4_decode(InputStream * inStream)
 		if (frameInfo.error > 0) {
 			ERROR("faad2 error: %s\n",
 			      faacDecGetErrorMessage(frameInfo.error));
-			eof = 1;
 			break;
 		}
 
@@ -270,10 +267,8 @@ static int mp4_decode(InputStream * inStream)
 
 		ob_send(sampleBuffer, sampleBufferLen, file_time,
 		        bitRate, NULL);
-		if (dc_intr()) {
-			eof = 1;
+		if (dc_intr())
 			break;
-		}
 	}
 
 	free(seekTable);