diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-06-06 14:21:19 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-06-16 15:53:55 +0200 |
| commit | f82e9deec2c2657d73731ab16c49efba5559670d (patch) | |
| tree | 2c6176a5503a5bdb1459812693218cb495e976e3 | |
| parent | d0cabcc78975e8d4ffc84cffc3a390807e415ffa (diff) | |
| download | ffmpeg-f82e9deec2c2657d73731ab16c49efba5559670d.tar.gz | |
4xm: drop pointless assert
Make sure the value of wlog2 is always between 0 and 3.
(cherry picked from commit 1f0c6075604c271d5627480f1243d22795f9a315)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/4xm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 696d2cf425..4973b41636 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -329,7 +329,7 @@ static inline void mcdc(uint16_t *dst, uint16_t *src, int log2w, } break; default: - assert(0); + break; } } @@ -345,7 +345,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) { |