Merge commit '5eb56283'

This commit is a no-op.

* commit '5eb56283':
  mov: Use the correct type for size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libavformat/mov.c

@@ -2162,7 +2162,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
         int ret, dref_id = 1;
         MOVAtom a = { AV_RL32("stsd") };
         int64_t start_pos = avio_tell(pb);
-        int64_t size = avio_rb32(pb); /* size */
+        int64_t size    = avio_rb32(pb); /* size */
         uint32_t format = avio_rl32(pb); /* data format */
 
         if (size >= 16) {
@@ -3130,6 +3130,7 @@ 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,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_replaygain(MOVContext *c, AVIOContext *pb, int64_t size)
+>>>>>>> 5eb562831b3a9bea8026c413ef1338e06450d005
 {
     int64_t end = avio_tell(pb) + size;
     uint8_t *key = NULL, *val = NULL;