aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-12-06 03:06:05 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-12-06 03:30:10 +0100
commit1ec9fd15b9c113e139b828e47b30f8c5f2169cc3 (patch)
tree5b70ee3aa8384eb023d15705445191ffccb92119
parent4a947f43850afde02b6c1c919505acb580858923 (diff)
downloadffmpeg-1ec9fd15b9c113e139b828e47b30f8c5f2169cc3.tar.gz
avformat/http: Match chunksize checks to master..3.0
Fixes warning about impossible condition Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/http.c b/libavformat/http.c
index cdcf4ccde6..d2e9ae1619 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -1176,10 +1176,10 @@ static int http_buf_read(URLContext *h, uint8_t *buf, int size)
memcpy(buf, s->buf_ptr, len);
s->buf_ptr += len;
} else {
- if ((!s->willclose || s->chunksize < 0) && s->off >= s->filesize)
+ if ((!s->willclose || s->chunksize == UINT64_MAX) && s->off >= s->filesize)
return AVERROR_EOF;
len = ffurl_read(s->hd, buf, size);
- if (!len && (!s->willclose || s->chunksize < 0) && s->off < s->filesize) {
+ if (!len && (!s->willclose || s->chunksize == UINT64_MAX) && s->off < s->filesize) {
av_log(h, AV_LOG_ERROR,
"Stream ends prematurely at %"PRIu64", should be %"PRIu64"\n",
s->off, s->filesize