diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-19 18:49:17 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-19 18:49:17 +0000 |
| commit | 6a855aae9482a0ce95cb9c428ed39b8af164f6af (patch) | |
| tree | 08101486dbcfda610b5be08fa5ca34f559696833 | |
| parent | eed36075645ecc3d3ef202c94badb66818114c2c (diff) | |
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."
Originally committed as revision 15369 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 018cc9243f..e2937d6ad3 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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); |