From 5e832bc28f8037edba509035294edc0e8b341e8b Mon Sep 17 00:00:00 2001 From: Jeff Downs Date: Fri, 12 Oct 2007 09:10:07 +0000 Subject: [PATCH] Interlaced pictures (not just MBAFF) + spatial direct mode is not implemented. Patch by Jeff Downs, heydowns . borg @ com Original thread: Enable PAFF decoding, 2007-10-09 11:04 Originally committed as revision 10714 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ffbf630bb5..3d11fb181f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4098,8 +4098,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ if(h->slice_type == B_TYPE){ h->direct_spatial_mv_pred= get_bits1(&s->gb); - if(h->sps.mb_aff && h->direct_spatial_mv_pred) - av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n"); + if(FIELD_OR_MBAFF_PICTURE && h->direct_spatial_mv_pred) + av_log(h->s.avctx, AV_LOG_ERROR, "Interlaced pictures + spatial direct mode is not implemented\n"); } num_ref_idx_active_override_flag= get_bits1(&s->gb);