Merge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'

[ffmpeg] / libavformat / ffmdec.c

diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index f754895986f9ab2892208ba4eb2a0bd000400584..41c518f3c76c8474141dc431082e2bf1f9b21462 100644 (file)
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -36,7 +36,7 @@ static int ffm_is_avail_data(AVFormatContext *s, int size)
 {
     FFMContext *ffm = s->priv_data;
     int64_t pos, avail_size;
-    int len;
+    ptrdiff_t len;
 
     len = ffm->packet_end - ffm->packet_ptr;
     if (size <= len)
@@ -87,8 +87,9 @@ static int ffm_read_data(AVFormatContext *s,
 {
     FFMContext *ffm = s->priv_data;
     AVIOContext *pb = s->pb;
-    int len, fill_size, size1, frame_offset;
+    int fill_size, size1, frame_offset;
     uint32_t id;
+    ptrdiff_t len;
     int64_t last_pos = -1;
 
     size1 = size;