generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

4xm: drop pointless assert

Browse Source 
Make sure the value of wlog2 is always between 0 and 3.
(cherry picked from commit 1f0c607560)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato
2013-06-06 14:21:19 +02:00
parent d0cabcc789
commit f82e9deec2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/4xm.c
View File

@@ -329,7 +329,7 @@ static inline void mcdc(uint16_t *dst, uint16_t *src, int log2w,
} }
break; break;
default: 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); uint16_t *end = start + stride * (f->avctx->height - h + 1) - (1 << log2w);
int ret; int ret;
if (code < 0 || code > 6) if (code < 0 || code > 6 || log2w < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (code == 0) { if (code == 0) {