Commit 5d876be8 authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Martin Storsjö
Browse files

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: default avatarMartin Storsjö <martin@martin.st>
parent f5e646a0
...@@ -238,7 +238,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int ...@@ -238,7 +238,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int
else else
av_usleep(1000); av_usleep(1000);
} else if (ret < 1) } else if (ret < 1)
return ret < 0 ? ret : len; return (ret < 0 && ret != AVERROR_EOF) ? ret : len;
if (ret) if (ret)
fast_retries = FFMAX(fast_retries, 2); fast_retries = FFMAX(fast_retries, 2);
len += ret; len += ret;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment