[FFmpeg-cvslog] avformat/http: Match chunksize checks to master..3.0

Michael Niedermayer git at videolan.org
Tue Dec 6 04:48:34 EET 2016


ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Tue Dec  6 03:06:05 2016 +0100| [1ec9fd15b9c113e139b828e47b30f8c5f2169cc3] | committer: Michael Niedermayer

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

Fixes warning about impossible condition

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ec9fd15b9c113e139b828e47b30f8c5f2169cc3
---

 libavformat/http.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index cdcf4cc..d2e9ae1 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



More information about the ffmpeg-cvslog mailing list