Merge commit '7f045c4429e91688f1f2335dd347203431901c06'

[ffmpeg] / libavformat / http.c

diff --git a/libavformat/http.c b/libavformat/http.c
index 622814bb05812ce1f2664f431933dde9bd5c7d1d..51275d9960530643cf380e0f41b41d859570ee87 100644 (file)
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -1220,7 +1220,8 @@ static int64_t http_seek_internal(URLContext *h, int64_t off, int whence, int fo
 static int http_read_stream(URLContext *h, uint8_t *buf, int size)
 {
     HTTPContext *s = h->priv_data;
-    int err, new_location, read_ret, seek_ret;
+    int err, new_location, read_ret;
+    int64_t seek_ret;
 
     if (!s->hd)
         return AVERROR_EOF;