diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 20:09:56 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 20:09:56 +0000 |
| commit | 00bd2374998856b71ff3ec50d3b6166f54d9601b (patch) | |
| tree | 139981aeeaaf3710d8003ae37057791fc360277b | |
| parent | 4e3185d208666f151e442ba0e9509f1e97ad865e (diff) | |
| download | ffmpeg-00bd2374998856b71ff3ec50d3b6166f54d9601b.tar.gz | |
mov: Fix leftover merge conflict cruft
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index e2348e12c4..1d0077e695 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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; |