OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
acf1dd5
)
avformat/mov: Fix integer truncation in mov_read_uuid()
author
Michael Niedermayer
<michael@niedermayer.cc>
Mon, 30 Jan 2017 22:03:02 +0000
(23:03 +0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Mon, 30 Jan 2017 22:19:01 +0000
(23:19 +0100)
Fixes Ticket6102
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
b1bfa0a
..
9ae4f8c
100644
(file)
--- 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;
+ int
64_t
ret;
uint8_t uuid[16];
static const uint8_t uuid_isml_manifest[] = {
0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd,