comparison h264.c @ 5812:05e66f9c15bb libavcodec

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
author cehoyos
date Fri, 12 Oct 2007 09:10:07 +0000
parents 62fc35411cb1
children fb293531e983
comparison
equal deleted inserted replaced
5811:2926fc2a0396 5812:05e66f9c15bb
4096 h->ref_count[1]= h->pps.ref_count[1]; 4096 h->ref_count[1]= h->pps.ref_count[1];
4097 4097
4098 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ 4098 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
4099 if(h->slice_type == B_TYPE){ 4099 if(h->slice_type == B_TYPE){
4100 h->direct_spatial_mv_pred= get_bits1(&s->gb); 4100 h->direct_spatial_mv_pred= get_bits1(&s->gb);
4101 if(h->sps.mb_aff && h->direct_spatial_mv_pred) 4101 if(FIELD_OR_MBAFF_PICTURE && h->direct_spatial_mv_pred)
4102 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n"); 4102 av_log(h->s.avctx, AV_LOG_ERROR, "Interlaced pictures + spatial direct mode is not implemented\n");
4103 } 4103 }
4104 num_ref_idx_active_override_flag= get_bits1(&s->gb); 4104 num_ref_idx_active_override_flag= get_bits1(&s->gb);
4105 4105
4106 if(num_ref_idx_active_override_flag){ 4106 if(num_ref_idx_active_override_flag){
4107 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; 4107 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;