From 87f20c2f314c9dd426d1f64b300ebc7a656202f8 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 11 Mar 2006 00:18:43 +0000
Subject: [PATCH] fix %8 != 0 w/h
Originally committed as revision 5144 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/snow.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 1edd387d676..58560e9570f 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -2520,11 +2520,11 @@ static void pred_block(SnowContext *s, uint8_t *dst, uint8_t *src, uint8_t *tmp,
ff_emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+5, b_h+5, sx, sy, w, h);
src= tmp + MB_SIZE;
}
- assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h);
- assert(!(b_w&(b_w-1)));
+// assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h);
+// assert(!(b_w&(b_w-1)));
assert(b_w>1 && b_h>1);
assert(tab_index>=0 && tab_index<4 || b_w==32);
- if((dx&3) || (dy&3))
+ if((dx&3) || (dy&3) || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) || (b_w&(b_w-1)))
mc_block(dst, src, tmp, stride, b_w, b_h, dx, dy);
else if(b_w==32){
int y;
--
GitLab