diff options
author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-01-31 00:57:48 +0000 |
---|---|---|
committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-01-31 00:57:48 +0000 |
commit | 8943802849c9444342cd09ee0b8c4bf246a6d730 (patch) | |
tree | 0a9e5298fd417d4ae5f3108b92007b228f787df5 /libavcodec/snow.c | |
parent | f0a708408877b6436e0b9161e44350a78bc40610 (diff) | |
download | ffmpeg-streaming-8943802849c9444342cd09ee0b8c4bf246a6d730.zip ffmpeg-streaming-8943802849c9444342cd09ee0b8c4bf246a6d730.tar.gz |
add parenthesis, fix warning: snow.c:2413: warning: suggest parentheses around && within ||
Originally committed as revision 11687 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/snow.c')
-rw-r--r-- | libavcodec/snow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 67edc34..4f8a8d0 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -2410,7 +2410,7 @@ static void pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, int stride, i // 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); + assert((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 ) mc_block(&s->plane[plane_index], dst, src, tmp, stride, b_w, b_h, dx, dy); else if(b_w==32){ |