[SCM] libav/experimental: parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 19d9ac8169aea4e1fa4b12fb23db1b0526f2dc63
Author: Alex Beregszaszi <alex at rtfs.hu>
Date:   Sat Jul 2 19:39:58 2005 +0000

    parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
    
    Originally committed as revision 4417 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index bb3c876..741c050 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2964,7 +2964,7 @@ static int alloc_tables(H264Context *h){
             shift -= 2;
         for(x=0; x<64; x++)
             h->dequant8_coeff[q][x] = dequant8_coeff_init[idx][
-                dequant8_coeff_init_scan[(x>>1)&12 | x&3] ] << shift;
+                dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] << shift;
     }
     if(h->sps.transform_bypass){
         for(x=0; x<16; x++)
@@ -4403,7 +4403,7 @@ static inline int get_dct8x8_allowed(H264Context *h){
     int i;
     for(i=0; i<4; i++){
         if(!IS_SUB_8X8(h->sub_mb_type[i])
-           || !h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i]))
+           || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i])))
             return 0;
     }
     return 1;

-- 
Libav/FFmpeg packaging