diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 14:23:44 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-09-13 15:24:51 +0200 |
| commit | 42ad4178fd2dfa38a9a713419641c2ff41a85e98 (patch) | |
| tree | 9729cd0bd46740ddd6cac39583de9acca1506a20 | |
| parent | 139f352daf84e005824562e0e0f36e06ac60ee36 (diff) | |
| download | ffmpeg-42ad4178fd2dfa38a9a713419641c2ff41a85e98.tar.gz | |
avio: Handle AVERROR_EOF in the same way as the return value 0
This makes sure the ffurl_read_complete function actually
returns the number of bytes read, as the documentation of the
function says, even if the underlying protocol uses AVERROR_EOF
instead of 0.
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 5d876be87a115b93dd2e644049e3ada2cfb5ccb7)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavformat/avio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index ee4dfb6c8c..cfefa60162 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -328,7 +328,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int else 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; |