Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / file.c

diff --git a/libavformat/file.c b/libavformat/file.c
index 8c41a3c3724e4a0a3c746f759fe8255abd271af0..209957b9d3f2debb825709d02605598cd5810b4c 100644 (file)
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -135,7 +135,7 @@ static int file_open(URLContext *h, const char *filename, int flags)
 static int64_t file_seek(URLContext *h, int64_t pos, int whence)
 {
     FileContext *c = h->priv_data;
-    off_t ret;
+    int64_t ret;
 
     if (whence == AVSEEK_SIZE) {
         struct stat st;