From 00bd2374998856b71ff3ec50d3b6166f54d9601b Mon Sep 17 00:00:00 2001
From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Tue, 16 Feb 2016 20:09:56 +0000
Subject: [PATCH] mov: Fix leftover merge conflict cruft
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
libavformat/mov.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index e2348e12c45..1d0077e695e 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;
--
GitLab