Commit fcfbc58a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '183b9d84'

* commit '183b9d84':
  ape: Don't allow the seektable to be omitted

See: e7cb1615Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4caf8c51 183b9d84
......@@ -258,7 +258,7 @@ static int ape_read_header(AVFormatContext * s)
ape->totalframes);
return AVERROR_INVALIDDATA;
}
if (ape->seektablelength && (ape->seektablelength / sizeof(*ape->seektable)) < ape->totalframes) {
if (ape->seektablelength / sizeof(*ape->seektable) < ape->totalframes) {
av_log(s, AV_LOG_ERROR,
"Number of seek entries is less than number of frames: %zu vs. %"PRIu32"\n",
ape->seektablelength / sizeof(*ape->seektable), ape->totalframes);
......@@ -290,9 +290,6 @@ static int ape_read_header(AVFormatContext * s)
for (i = 0; i < ape->totalframes && !pb->eof_reached; i++)
ape->bittable[i] = avio_r8(pb);
}
}else{
av_log(s, AV_LOG_ERROR, "Missing seektable\n");
return AVERROR_INVALIDDATA;
}
ape->frames[0].pos = ape->firstframe;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment