diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-31 16:26:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-31 17:16:44 +0200 |
| commit | e868f84e83473221e98b56bb51c6cd1bedf91625 (patch) | |
| tree | 0246cacc4f05fd23b60b0fbd326e576ab8a8cfd4 | |
| parent | aab2e939a9a1bbf72469a690808dd9644c85ccee (diff) | |
| download | ffmpeg-e868f84e83473221e98b56bb51c6cd1bedf91625.tar.gz | |
avcodec/snow: fix 1 pixel block sizes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/snow.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 3a825bd34c..bd20388847 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -358,9 +358,13 @@ void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, ptrdiff_t st av_assert2(s->chroma_h_shift == s->chroma_v_shift); // only one mv_scale - av_assert2(b_w>1 && b_h>1); av_assert2((tab_index>=0 && tab_index<4) || b_w==32); - if((dx&3) || (dy&3) || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) || (b_w&(b_w-1)) || !s->plane[plane_index].fast_mc ) + if( (dx&3) || (dy&3) + || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) + || (b_w&(b_w-1)) + || b_w == 1 + || b_h == 1 + || !s->plane[plane_index].fast_mc ) mc_block(&s->plane[plane_index], dst, src, stride, b_w, b_h, dx, dy); else if(b_w==32){ int y; |