diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 13:45:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 13:51:20 +0200 |
| commit | fcfbc58a1cd77f3781a52f7517cdd255664da193 (patch) | |
| tree | fc7f3d5a998d3a1afe2e035dc1db911d4878c222 | |
| parent | 4caf8c51de93a55a3f3605c06fb0663486155c8d (diff) | |
| parent | 183b9d843a9533774fabd3984a52f3987001acbc (diff) | |
| download | ffmpeg-fcfbc58a1cd77f3781a52f7517cdd255664da193.tar.gz | |
Merge commit '183b9d843a9533774fabd3984a52f3987001acbc'
* commit '183b9d843a9533774fabd3984a52f3987001acbc':
ape: Don't allow the seektable to be omitted
See: e7cb161515fc9fb6d30d1681d64d9ba7ad737a4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/ape.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/ape.c b/libavformat/ape.c index 6a78ea9908..7ed9dd813b 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -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; |