Skip to content

F
ffmpeg.wasm-core
Commit 00bd2374 authored by Derek Buitenhuis's avatar Derek Buitenhuis
Browse files
Options

mov: Fix leftover merge conflict cruft 

Signed-off-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parent 4e3185d2
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
libavformat/mov.c
View file @ 00bd2374
...@@ -3130,7 +3130,6 @@ static int mov_read_ilst(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -3130,7 +3130,6 @@ 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,10 +3172,7 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -3173,10 +3172,7 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0; return 0;
} }
static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int size) static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int64_t 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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment