har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '5eb562831b3a9bea8026c413ef1338e06450d005'

Browse Source 
This commit is a no-op.

* commit '5eb562831b3a9bea8026c413ef1338e06450d005':
  mov: Use the correct type for size

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-02-16 20:07:08 +00:00
commit 4e3185d208
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mov.c
View File

@ -3130,6 +3130,7 @@ static int mov_read_ilst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return ret; return ret;
} }
<<<<<<< HEAD
static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
uint32_t count; uint32_t count;
@ -3173,6 +3174,9 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} }
static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int size) static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int size)
=======
static int mov_read_replaygain(MOVContext *c, AVIOContext *pb, int64_t size)
>>>>>>> 5eb562831b3a9bea8026c413ef1338e06450d005
{ {
int64_t end = avio_tell(pb) + size; int64_t end = avio_tell(pb) + size;
uint8_t *key = NULL, *val = NULL; uint8_t *key = NULL, *val = NULL;