Module: libav
Branch: release/11
Commit: 7f533024ec94ee9e09f5c1cd7f45d63c11cd32c7
Author: Luca Barbato <lu_z...@gentoo.org>
Committer: Luca Barbato <lu_z...@gentoo.org>
Date: Tue Feb 9 23:07:18 2016 +0100
mov: Use the correct type for size
An AVIO offset is int64_t.
Bug-Id: 921
---
libavformat/mov.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3d2ec8c..352510b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1349,7 +1349,7 @@ static void mov_parse_stsd_audio(MOVContext *c,
AVIOContext *pb,
static void mov_parse_stsd_subtitle(MOVContext *c, AVIOContext *pb,
AVStream *st, MOVStreamContext *sc,
- int size)
+ int64_t size)
{
// ttxt stsd contains display flags, justification, background
// color, fonts, and default styles, so fake an atom to read it
@@ -1414,7 +1414,7 @@ static int mov_rewrite_dvd_sub_extradata(AVStream *st)
static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb,
AVStream *st, MOVStreamContext *sc,
- int size)
+ int64_t size)
{
if (st->codec->codec_tag == MKTAG('t','m','c','d')) {
st->codec->extradata_size = size;
@@ -1499,7 +1499,7 @@ static int mov_finalize_stsd_codec(MOVContext *c,
AVIOContext *pb,
static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
int codec_tag, int format,
- int size)
+ int64_t size)
{
int video_codec_id = ff_codec_get_id(ff_codec_movvideo_tags, format);
@@ -1541,7 +1541,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);
- uint32_t size = avio_rb32(pb); /* size */
+ int64_t size = avio_rb32(pb); /* size */
uint32_t format = avio_rl32(pb); /* data format */
if (size >= 16) {
@@ -2296,7 +2296,7 @@ static int mov_read_ilst(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
return ret;
}
-static int mov_read_replaygain(MOVContext *c, AVIOContext *pb, int size)
+static int mov_read_replaygain(MOVContext *c, AVIOContext *pb, int64_t size)
{
int64_t end = avio_tell(pb) + size;
uint8_t *key = NULL, *val = NULL;
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
