diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 20:07:08 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 20:07:08 +0000 |
| commit | 4e3185d208666f151e442ba0e9509f1e97ad865e (patch) | |
| tree | 7f9cca4e788f7013b9bc58046c5cc0c2e94ba561 | |
| parent | cbe3f28d0ac7e102edf1dfd7733a303016a1b788 (diff) | |
| parent | 5eb562831b3a9bea8026c413ef1338e06450d005 (diff) | |
Merge commit '5eb562831b3a9bea8026c413ef1338e06450d005'
This commit is a no-op.
* commit '5eb562831b3a9bea8026c413ef1338e06450d005':
mov: Use the correct type for size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 149e3b4a0e..e2348e12c4 100644 --- a/libavformat/mov.c +++ b/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; |