Mercurial > libavcodec.hg
comparison h264.c @ 7893:463362e06206 libavcodec
Remove check and error message for "MBAFF + !direct_8x8_inference is not implemented"
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."
author | michael |
---|---|
date | Fri, 19 Sep 2008 18:49:17 +0000 |
parents | 59e42f624d4d |
children | 340c33b1efaa |
comparison
equal
deleted
inserted
replaced
7892:59e42f624d4d | 7893:463362e06206 |
---|---|
7076 | 7076 |
7077 #ifndef ALLOW_INTERLACE | 7077 #ifndef ALLOW_INTERLACE |
7078 if(sps->mb_aff) | 7078 if(sps->mb_aff) |
7079 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n"); | 7079 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n"); |
7080 #endif | 7080 #endif |
7081 if(!sps->direct_8x8_inference_flag && sps->mb_aff) | |
7082 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n"); | |
7083 | |
7084 sps->crop= get_bits1(&s->gb); | 7081 sps->crop= get_bits1(&s->gb); |
7085 if(sps->crop){ | 7082 if(sps->crop){ |
7086 sps->crop_left = get_ue_golomb(&s->gb); | 7083 sps->crop_left = get_ue_golomb(&s->gb); |
7087 sps->crop_right = get_ue_golomb(&s->gb); | 7084 sps->crop_right = get_ue_golomb(&s->gb); |
7088 sps->crop_top = get_ue_golomb(&s->gb); | 7085 sps->crop_top = get_ue_golomb(&s->gb); |