|
|
|
@ -412,7 +412,7 @@ retry: |
|
|
|
key = c->meta_keys[index]; |
|
|
|
key = c->meta_keys[index]; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
av_log(c->fc, AV_LOG_WARNING, |
|
|
|
av_log(c->fc, AV_LOG_WARNING, |
|
|
|
"The index of 'data' is out of range: %d < 1 or >= %d.\n", |
|
|
|
"The index of 'data' is out of range: %"PRId32" < 1 or >= %d.\n", |
|
|
|
index, c->meta_keys_count); |
|
|
|
index, c->meta_keys_count); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -686,7 +686,7 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom) |
|
|
|
avio_skip(pb, len); |
|
|
|
avio_skip(pb, len); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
av_log(c->fc, AV_LOG_DEBUG, "Unknown dref type 0x%08x size %d\n", |
|
|
|
av_log(c->fc, AV_LOG_DEBUG, "Unknown dref type 0x%08"PRIx32" size %"PRIu32"\n", |
|
|
|
dref->type, size); |
|
|
|
dref->type, size); |
|
|
|
entries--; |
|
|
|
entries--; |
|
|
|
i--; |
|
|
|
i--; |
|
|
|
@ -700,7 +700,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom) |
|
|
|
{ |
|
|
|
{ |
|
|
|
AVStream *st; |
|
|
|
AVStream *st; |
|
|
|
uint32_t type; |
|
|
|
uint32_t type; |
|
|
|
uint32_t av_unused ctype; |
|
|
|
uint32_t ctype; |
|
|
|
int64_t title_size; |
|
|
|
int64_t title_size; |
|
|
|
char *title_str; |
|
|
|
char *title_str; |
|
|
|
int ret; |
|
|
|
int ret; |
|
|
|
@ -712,8 +712,8 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom) |
|
|
|
ctype = avio_rl32(pb); |
|
|
|
ctype = avio_rl32(pb); |
|
|
|
type = avio_rl32(pb); /* component subtype */ |
|
|
|
type = avio_rl32(pb); /* component subtype */ |
|
|
|
|
|
|
|
|
|
|
|
av_log(c->fc, AV_LOG_TRACE, "ctype= %.4s (0x%08x)\n", (char*)&ctype, ctype); |
|
|
|
av_log(c->fc, AV_LOG_TRACE, "ctype=%s\n", av_fourcc2str(ctype)); |
|
|
|
av_log(c->fc, AV_LOG_TRACE, "stype= %.4s\n", (char*)&type); |
|
|
|
av_log(c->fc, AV_LOG_TRACE, "stype=%s\n", av_fourcc2str(type)); |
|
|
|
|
|
|
|
|
|
|
|
if (c->trak_index < 0) { // meta not inside a trak
|
|
|
|
if (c->trak_index < 0) { // meta not inside a trak
|
|
|
|
if (type == MKTAG('m','d','t','a')) { |
|
|
|
if (type == MKTAG('m','d','t','a')) { |
|
|
|
@ -2284,8 +2284,8 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) |
|
|
|
id = mov_codec_id(st, format); |
|
|
|
id = mov_codec_id(st, format); |
|
|
|
|
|
|
|
|
|
|
|
av_log(c->fc, AV_LOG_TRACE, |
|
|
|
av_log(c->fc, AV_LOG_TRACE, |
|
|
|
"size=%"PRId64" 4CC=%s/0x%08x codec_type=%d\n", size, |
|
|
|
"size=%"PRId64" 4CC=%s codec_type=%d\n", size, |
|
|
|
av_fourcc2str(format), format, st->codecpar->codec_type); |
|
|
|
av_fourcc2str(format), st->codecpar->codec_type); |
|
|
|
|
|
|
|
|
|
|
|
if (st->codecpar->codec_type==AVMEDIA_TYPE_VIDEO) { |
|
|
|
if (st->codecpar->codec_type==AVMEDIA_TYPE_VIDEO) { |
|
|
|
st->codecpar->codec_id = id; |
|
|
|
st->codecpar->codec_id = id; |
|
|
|
@ -3816,7 +3816,7 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom) |
|
|
|
count = avio_rb32(pb); |
|
|
|
count = avio_rb32(pb); |
|
|
|
if (count > UINT_MAX / sizeof(*c->meta_keys) - 1) { |
|
|
|
if (count > UINT_MAX / sizeof(*c->meta_keys) - 1) { |
|
|
|
av_log(c->fc, AV_LOG_ERROR, |
|
|
|
av_log(c->fc, AV_LOG_ERROR, |
|
|
|
"The 'keys' atom with the invalid key count: %d\n", count); |
|
|
|
"The 'keys' atom with the invalid key count: %"PRIu32"\n", count); |
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -3830,7 +3830,8 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom) |
|
|
|
uint32_t type = avio_rl32(pb); |
|
|
|
uint32_t type = avio_rl32(pb); |
|
|
|
if (key_size < 8) { |
|
|
|
if (key_size < 8) { |
|
|
|
av_log(c->fc, AV_LOG_ERROR, |
|
|
|
av_log(c->fc, AV_LOG_ERROR, |
|
|
|
"The key# %d in meta has invalid size: %d\n", i, key_size); |
|
|
|
"The key# %"PRIu32" in meta has invalid size:" |
|
|
|
|
|
|
|
"%"PRIu32"\n", i, key_size); |
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
} |
|
|
|
} |
|
|
|
key_size -= 8; |
|
|
|
key_size -= 8; |
|
|
|
@ -5379,8 +5380,8 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) |
|
|
|
total_size += 8; |
|
|
|
total_size += 8; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
av_log(c->fc, AV_LOG_TRACE, "type: %08x '%.4s' parent:'%.4s' sz: %"PRId64" %"PRId64" %"PRId64"\n", |
|
|
|
av_log(c->fc, AV_LOG_TRACE, "type:'%s' parent:'%s' sz: %"PRId64" %"PRId64" %"PRId64"\n", |
|
|
|
a.type, (char*)&a.type, (char*)&atom.type, a.size, total_size, atom.size); |
|
|
|
av_fourcc2str(a.type), av_fourcc2str(atom.type), a.size, total_size, atom.size); |
|
|
|
if (a.size == 0) { |
|
|
|
if (a.size == 0) { |
|
|
|
a.size = atom.size - total_size + 8; |
|
|
|
a.size = atom.size - total_size + 8; |
|
|
|
} |
|
|
|
} |
|
|
|
|
Clément Bœsch
8 years ago