Module: libav Branch: master Commit: 1f0c6075604c271d5627480f1243d22795f9a315
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Thu Jun 6 14:21:19 2013 +0200 4xm: drop pointless assert Make sure the value of wlog2 is always between 0 and 3. --- libavcodec/4xm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 4a293eb..1e70644 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -327,7 +327,7 @@ static inline void mcdc(uint16_t *dst, uint16_t *src, int log2w, } break; default: - assert(0); + break; } } @@ -343,7 +343,7 @@ static int decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, uint16_t *end = start + stride * (f->avctx->height - h + 1) - (1 << log2w); int ret; - if (code < 0 || code > 6) + if (code < 0 || code > 6 || log2w < 0) return AVERROR_INVALIDDATA; if (code == 0) { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
