Module: libav Branch: master Commit: 5d876be87a115b93dd2e644049e3ada2cfb5ccb7
Author: Michael Niedermayer <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Mon Jun 24 14:23:44 2013 +0200 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ö <[email protected]> --- libavformat/avio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index a43b241..ad39e6f 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -238,7 +238,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int else 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; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
