ffmpeg: removed loop from mpd_ffmpeg_read()

The function decoder_read() already cares about the decoder command, and loops until data is available. Reduced mpd_ffmpeg_read() to no more than the decoder_read() call.

ffmpeg: removed loop from mpd_ffmpeg_read()
ab07cdd4 · Max Kellermann · 292334a2 · ab07cdd4
Commit ab07cdd4 authored Nov 04, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 15 deletions

ffmpeg_plugin.c src/decoder/ffmpeg_plugin.c +2 -15

No files found.
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -18,8 +18,6 @@
 #include "../decoder_api.h"
 #include "../log.h"
-#include "../utils.h"
-#include "../log.h"
 #include <assert.h>
 #include <stdio.h>
@@ -84,19 +82,8 @@ static int mpd_ffmpeg_read(URLContext *h, unsigned char *buf, int size)
 {
 	struct ffmpeg_stream *stream = (struct ffmpeg_stream *) h->priv_data;
-	while (true) {
+	return decoder_read(stream->decoder, stream->input,
-		size_t ret = decoder_read(stream->decoder, stream->input,
+			    (void *)buf, size);
-					  (void *)buf, size);
-		if (ret > 0)
-			return ret;
-		if (input_stream_eof(stream->input) ||
-		    (stream->decoder &&
-		     decoder_get_command(stream->decoder) != DECODE_COMMAND_NONE))
-			return 0;
-		my_usleep(10000);
-	}
 }
 static int64_t mpd_ffmpeg_seek(URLContext *h, int64_t pos, int whence)