comparison h264.c @ 7344:c2d0de091b69 libavcodec

Revert r13542: Spatial direct mode probably also works with PAFF.
author cehoyos
date Mon, 21 Jul 2008 22:46:47 +0000
parents 9a4cb430d8ff
children a36996f67748
comparison
equal deleted inserted replaced
7343:9a4cb430d8ff 7344:c2d0de091b69
4115 h->ref_count[1]= h->pps.ref_count[1]; 4115 h->ref_count[1]= h->pps.ref_count[1];
4116 4116
4117 if(h->slice_type_nos != FF_I_TYPE){ 4117 if(h->slice_type_nos != FF_I_TYPE){
4118 if(h->slice_type_nos == FF_B_TYPE){ 4118 if(h->slice_type_nos == FF_B_TYPE){
4119 h->direct_spatial_mv_pred= get_bits1(&s->gb); 4119 h->direct_spatial_mv_pred= get_bits1(&s->gb);
4120 if(FIELD_PICTURE && h->direct_spatial_mv_pred)
4121 av_log(h->s.avctx, AV_LOG_ERROR, "PAFF + spatial direct mode is not implemented\n");
4122 } 4120 }
4123 num_ref_idx_active_override_flag= get_bits1(&s->gb); 4121 num_ref_idx_active_override_flag= get_bits1(&s->gb);
4124 4122
4125 if(num_ref_idx_active_override_flag){ 4123 if(num_ref_idx_active_override_flag){
4126 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; 4124 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;