From 1f0c6075604c271d5627480f1243d22795f9a315 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Thu, 6 Jun 2013 14:21:19 +0200
Subject: [PATCH] 4xm: drop pointless assert
Make sure the value of wlog2 is always between 0 and 3.
---
libavcodec/4xm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 4a293ebda2b..1e706448c15 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) {
--
GitLab