[FFmpeg-cvslog] avformat/avio: Fix EOF handiling of ffurl_read_complete()
Michael Niedermayer
git at videolan.org
Mon Jun 24 14:29:48 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 24 14:23:44 2013 +0200| [a46e578ddacd680b5b169a70c61032381a1b9f63] | committer: Michael Niedermayer
avformat/avio: Fix EOF handiling of ffurl_read_complete()
Fixes Ticket2537
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a46e578ddacd680b5b169a70c61032381a1b9f63
---
libavformat/avio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/avio.c b/libavformat/avio.c
index f6af0cb..73b2a29 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -290,7 +290,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int
av_usleep(1000);
}
} else if (ret < 1)
- return ret < 0 ? ret : len;
+ return (ret < 0 && ret != AVERROR_EOF) ? ret : len;
if (ret)
fast_retries = FFMAX(fast_retries, 2);
len += ret;
More information about the ffmpeg-cvslog
mailing list