Mercurial > libavcodec.hg
changeset 11090:eda7b4f6db51 libavcodec
Remove FIXMEs for cases that are disallowed by the spec.
author | michael |
---|---|
date | Sun, 07 Feb 2010 15:13:56 +0000 |
parents | 68fa9b353337 |
children | 74748a220032 |
files | h264_direct.c |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);