4xm: drop pointless assert

Make sure the value of wlog2 is always between 0 and 3.
12 years ago · 1f0c607560
parent b8b809908e
commit 1f0c607560
1 changed files with 2 additions and 2 deletions
--- 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) {