[SCM] libav/experimental: add parenthesis, fix warning: i386/dsputil_mmx.c:2618: warning: suggest parentheses around arithmetic in operand of |

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:12:36 UTC 2013


The following commit has been merged in the experimental branch:
commit 066e0cc50d8b82f01383983b7112b619240f08d7
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Wed Jan 30 23:54:59 2008 +0000

    add parenthesis, fix warning: i386/dsputil_mmx.c:2618: warning: suggest parentheses around arithmetic in operand of |
    
    Originally committed as revision 11673 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index af574b4..fbe695d 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -2615,8 +2615,8 @@ static void gmc_mmx(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int o
     const int dxh = dxy*(h-1);
     const int dyw = dyx*(w-1);
     if( // non-constant fullpel offset (3% of blocks)
-        (ox^(ox+dxw) | ox^(ox+dxh) | ox^(ox+dxw+dxh) |
-         oy^(oy+dyw) | oy^(oy+dyh) | oy^(oy+dyw+dyh)) >> (16+shift)
+        ((ox^(ox+dxw)) | (ox^(ox+dxh)) | (ox^(ox+dxw+dxh)) |
+         (oy^(oy+dyw)) | (oy^(oy+dyh)) | (oy^(oy+dyw+dyh))) >> (16+shift)
         // uses more than 16 bits of subpel mv (only at huge resolution)
         || (dxx|dxy|dyx|dyy)&15 )
     {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list