From: Michael Niedermayer <michael@niedermayer.cc>
Date: Mon, 30 Jan 2017 22:03:02 +0000 (+0100)
Subject: avformat/mov: Fix integer truncation in mov_read_uuid()
X-Git-Tag: android-x86-7.1-r1~2297
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=06c143e505779efbc1d0b551b2615f010d5eb6fa;p=android-x86%2Fexternal-ffmpeg.git

avformat/mov: Fix integer truncation in mov_read_uuid()

Fixes Ticket6102

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index b1bfa0a35f..9ae4f8c09c 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4700,7 +4700,7 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 {
     AVStream *st;
     MOVStreamContext *sc;
-    int ret;
+    int64_t ret;
     uint8_t uuid[16];
     static const uint8_t uuid_isml_manifest[] = {
         0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd,