aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-24 14:23:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-24 14:23:44 +0200
commita46e578ddacd680b5b169a70c61032381a1b9f63 (patch)
treed00f8d2fca6f53c069f18e358e387867176c27f4
parentf48366c7040ab2544a1d624f0a927a0b7780dd06 (diff)
downloadffmpeg-a46e578ddacd680b5b169a70c61032381a1b9f63.tar.gz
avformat/avio: Fix EOF handiling of ffurl_read_complete()
Fixes Ticket2537 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/avio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c
index f6af0cb9e6..73b2a29801 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;