From cd7a7204268167e8bd2d7c7678ce603096b2a4e2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 30 Oct 2008 19:02:01 +0100 Subject: ffmpeg: simplified mpdurl_read() The function mpdurl_read() is too complicated, and uses the wrong data types. --- src/decoder/ffmpeg_plugin.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'src/decoder/ffmpeg_plugin.c') diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c index 6f8ad3a4a..7bb29fedc 100644 --- a/src/decoder/ffmpeg_plugin.c +++ b/src/decoder/ffmpeg_plugin.c @@ -82,22 +82,20 @@ static int mpdurl_open(URLContext *h, const char *filename, static int mpdurl_read(URLContext *h, unsigned char *buf, int size) { - int ret; FopsHelper *base = (FopsHelper *) h->priv_data; + while (true) { - ret = input_stream_read(base->input, (void *)buf, size); - if (ret == 0) { - if (input_stream_eof(base->input) || - (base->decoder && - decoder_get_command(base->decoder) != DECODE_COMMAND_NONE)) - return ret; - else - my_usleep(10000); - } else { - break; - } + size_t ret = input_stream_read(base->input, (void *)buf, size); + if (ret > 0) + return ret; + + if (input_stream_eof(base->input) || + (base->decoder && + decoder_get_command(base->decoder) != DECODE_COMMAND_NONE)) + return 0; + + my_usleep(10000); } - return ret; } static int64_t mpdurl_seek(URLContext *h, int64_t pos, int whence) -- cgit v1.2.3