diff options
author | Rodger Combs <rodger.combs@gmail.com> | 2015-10-18 17:50:21 -0500 |
---|---|---|
committer | Rodger Combs <rodger.combs@gmail.com> | 2015-11-25 19:34:01 -0600 |
commit | 362c17e6563808ef48655e5ddf59a35b6497b8b2 (patch) | |
tree | 819dc6f78ce8e6740ad90e1e311d209e52f5a378 | |
parent | b3494e3c3eab98cfca8a39ce1122f79becbf7cfa (diff) | |
download | ffmpeg-362c17e6563808ef48655e5ddf59a35b6497b8b2.tar.gz |
lavf/http: fix incorrect warning in range requests
-rw-r--r-- | libavformat/http.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 4b4a22559b..606286ad5a 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1155,15 +1155,16 @@ static int http_buf_read(URLContext *h, uint8_t *buf, int size) memcpy(buf, s->buf_ptr, len); s->buf_ptr += len; } else { + int64_t target_end = s->end_off ? s->end_off : s->filesize; if ((!s->willclose || s->chunksize < 0) && - s->filesize >= 0 && s->off >= s->filesize) + target_end >= 0 && s->off >= target_end) return AVERROR_EOF; len = ffurl_read(s->hd, buf, size); 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, "Stream ends prematurely at %"PRId64", should be %"PRId64"\n", - s->off, s->filesize + s->off, target_end ); return AVERROR(EIO); } |