[SCM] libav/experimental: Remove FIXMEs for cases that are disallowed by the spec.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:59:32 UTC 2013
The following commit has been merged in the experimental branch:
commit 668fd14287c81f3ddda5fef070160a8de32413b2
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Feb 7 15:13:56 2010 +0000
Remove FIXMEs for cases that are disallowed by the spec.
Originally committed as revision 21669 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 0dcf28f..89477af 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);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list