virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

lavf/http: fix incorrect warning in range requests

Browse Source
This commit is contained in:
Rodger Combs
2015-10-18 17:50:21 -05:00
parent b3494e3c3e
commit 362c17e656
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/http.c
View File

@ -1155,15 +1155,16 @@ 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 {
int64_t target_end = s->end_off ? s->end_off : s->filesize;
if ((!s->willclose || s->chunksize < 0) && if ((!s->willclose || s->chunksize < 0) &&
s->filesize >= 0 && s->off >= s->filesize) target_end >= 0 && s->off >= target_end)
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) && if (!len && (!s->willclose || s->chunksize < 0) &&
s->filesize >= 0 && s->off < s->filesize) { target_end >= 0 && s->off < target_end) {
av_log(h, AV_LOG_ERROR, av_log(h, AV_LOG_ERROR,
"Stream ends prematurely at %"PRId64", should be %"PRId64"\n", "Stream ends prematurely at %"PRId64", should be %"PRId64"\n",
s->off, s->filesize s->off, target_end
); );
return AVERROR(EIO); return AVERROR(EIO);
} }