highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/http: Match chunksize checks to master..3.0

Browse Source 
Fixes warning about impossible condition

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-12-06 03:06:05 +01:00
parent 4a947f4385
commit 1ec9fd15b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/http.c
View File

@ -1176,10 +1176,10 @@ static int http_buf_read(URLContext *h, uint8_t *buf, int size)
memcpy(buf, s->buf_ptr, len); memcpy(buf, s->buf_ptr, len);
s->buf_ptr += len; s->buf_ptr += len;
} else { } 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; return AVERROR_EOF;
len = ffurl_read(s->hd, buf, size); 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, av_log(h, AV_LOG_ERROR,
"Stream ends prematurely at %"PRIu64", should be %"PRIu64"\n", "Stream ends prematurely at %"PRIu64", should be %"PRIu64"\n",
s->off, s->filesize s->off, s->filesize