diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-03-11 00:18:43 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-03-11 00:18:43 +0000 |
| commit | 87f20c2f314c9dd426d1f64b300ebc7a656202f8 (patch) | |
| tree | 28c8f81d1fc68fb1f00f4444389acbd8b59388a4 | |
| parent | 8437ff75f865cdc3849c6518409aa0ef85eb88cf (diff) | |
| download | ffmpeg-streaming-87f20c2f314c9dd426d1f64b300ebc7a656202f8.zip ffmpeg-streaming-87f20c2f314c9dd426d1f64b300ebc7a656202f8.tar.gz | |
fix %8 != 0 w/h
Originally committed as revision 5144 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/snow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 1edd387..58560e9 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; |
