[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec h264.c,1.142,1.143

Alex Beregszaszi alex
Sat Jul 2 21:40:01 CEST 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv26342

Modified Files:
	h264.c 
Log Message:
parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed

Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- h264.c	28 Jun 2005 08:13:23 -0000	1.142
+++ h264.c	2 Jul 2005 19:39:58 -0000	1.143
@@ -2964,7 +2964,7 @@
             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 @@
     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;





More information about the ffmpeg-cvslog mailing list