aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-11 22:29:33 +0300
committerLuca Barbato <lu_zero@gentoo.org>2014-01-07 09:43:56 +0100
commitf241d5aa1fa45d98c26accd0832c354e7ec64e5a (patch)
tree7adfb7f59cf0b0e899298257af12bfedd29c46d0 /libavformat
parent7d8a4bb8d2ca8d12043ec78d2546323e3a35114f (diff)
downloadffmpeg-f241d5aa1fa45d98c26accd0832c354e7ec64e5a.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>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/ape.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/ape.c b/libavformat/ape.c
index 7d4cd39568..2e5250b0c1 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -255,7 +255,7 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
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);