# HG changeset patch # User michael # Date 1265555636 0 # Node ID eda7b4f6db51c1dcf6ccc367ab5263d89f98cb5b # Parent 68fa9b35333785226b65fdc14792408d9624c2ce Remove FIXMEs for cases that are disallowed by the spec. diff -r 68fa9b353337 -r eda7b4f6db51 h264_direct.c --- a/h264_direct.c Sun Feb 07 15:12:37 2010 +0000 +++ b/h264_direct.c Sun Feb 07 15:13:56 2010 +0000 @@ -172,7 +172,7 @@ mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy + s->mb_stride]; b8_stride *= 3; b4_stride *= 6; - //FIXME IS_8X8(mb_type_col[0]) && !h->sps.direct_8x8_inference_flag + if( (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA) && (mb_type_col[1] & MB_TYPE_16x16_OR_INTRA) && !is_b8x8){ @@ -357,7 +357,6 @@ ref_offset += 16; if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){ - /* FIXME assumes direct_8x8_inference == 1 */ int y_shift = 2*!IS_INTERLACED(*mb_type); assert(h->sps.direct_8x8_inference_flag);