Mercurial > libavcodec.hg
diff h264_direct.c @ 11097:7e5d7873fad9 libavcodec
Set x264_build so that checks are simpler.
author | michael |
---|---|
date | Mon, 08 Feb 2010 00:08:05 +0000 |
parents | 2aeb7a1d1c7f |
children | 8023ba45995f |
line wrap: on
line diff
--- a/h264_direct.c Sun Feb 07 23:15:53 2010 +0000 +++ b/h264_direct.c Mon Feb 08 00:08:05 2010 +0000 @@ -286,7 +286,7 @@ if(!IS_INTRA(mb_type_col[0]) && !h->ref_list[1][0].long_ref && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1) || (l1ref0[0] < 0 && l1ref1[0] == 0 && FFABS(l1mv1[0][0]) <= 1 && FFABS(l1mv1[0][1]) <= 1 - && (h->x264_build>33 || !h->x264_build)))){ + && h->x264_build>33U))){ a=b=0; if(ref[0] > 0) a= pack16to32(mv[0][0],mv[0][1]); @@ -315,7 +315,7 @@ /* col_zero_flag */ if(!IS_INTRA(mb_type_col[0]) && !h->ref_list[1][0].long_ref && ( l1ref0[x8 + y8*b8_stride] == 0 || (l1ref0[x8 + y8*b8_stride] < 0 && l1ref1[x8 + y8*b8_stride] == 0 - && (h->x264_build>33 || !h->x264_build)))){ + && h->x264_build>33U))){ const int16_t (*l1mv)[2]= l1ref0[x8 + y8*b8_stride] == 0 ? l1mv0 : l1mv1; if(IS_SUB_8X8(sub_mb_type)){ const int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride];