RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mov: Fix leftover merge conflict cruft 

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

6
libavformat/mov.c
View File

@ -3130,7 +3130,6 @@ static int mov_read_ilst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return ret;
}
<<<<<<< HEAD
static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
uint32_t count;
@ -3173,10 +3172,7 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0;
}
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
static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int64_t size)
{
int64_t end = avio_tell(pb) + size;
uint8_t *key = NULL, *val = NULL;