aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-11 22:29:33 +0300
committerLuca Barbato <lu_zero@gentoo.org>2013-10-03 20:29:31 +0200
commiteba112b4e3313e31f64e93bc878785822a55943e (patch)
treeee4ed12207d72214137f149e765a33d1c94842e6
parentd411f0775189516739ddc7c12626f486c28caf58 (diff)
downloadffmpeg-eba112b4e3313e31f64e93bc878785822a55943e.tar.gz
ape: Don't allow the seektable to be omitted
The seektable is required for filling in ape->frames[i].pos further down. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 183b9d843a9533774fabd3984a52f3987001acbc) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavformat/ape.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/ape.c b/libavformat/ape.c
index a9c695efe0..3c25630de0 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -255,7 +255,7 @@ static int ape_read_header(AVFormatContext * s)
ape->totalframes);
return -1;
}
- 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);