Remove check and error message for "MBAFF + !direct_8x8_inference is not implemented"
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Sep 2008 18:49:17 +0000 (18:49 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Sep 2008 18:49:17 +0000 (18:49 +0000)
because this mode does not exist, H.264-2007 says "When frame_mbs_only_flag is
equal to 0, direct_8x8_inference_flag shall be equal to 1."

Originally committed as revision 15369 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.c

index 018cc92..e2937d6 100644 (file)
@@ -7078,9 +7078,6 @@ static inline int decode_seq_parameter_set(H264Context *h){
     if(sps->mb_aff)
         av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n");
 #endif
-    if(!sps->direct_8x8_inference_flag && sps->mb_aff)
-        av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n");
-
     sps->crop= get_bits1(&s->gb);
     if(sps->crop){
         sps->crop_left  = get_ue_golomb(&s->gb);