diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-07 15:13:56 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-07 15:13:56 +0000 |
| commit | 668fd14287c81f3ddda5fef070160a8de32413b2 (patch) | |
| tree | dde441cc2b03533822b9ef8db7c17f2a89cd942f | |
| parent | 1c3ce2cd3ef3df47eccb0245017a6d2f3d5308b4 (diff) | |
| download | ffmpeg-668fd14287c81f3ddda5fef070160a8de32413b2.tar.gz | |
Remove FIXMEs for cases that are disallowed by the spec.
Originally committed as revision 21669 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264_direct.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 0dcf28fdf9..89477afce4 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -172,7 +172,7 @@ void ff_h264_pred_direct_motion(H264Context * const h, int *mb_type){ 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 @@ single_col: 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); |