Mercurial > libavcodec.hg

comparison h264.c @ 4354:d18568fb0187 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid calling decode_slice when context_initialized is not set. Avoids a crash due to dsp.clear_blocks being NULL when called.
author reimar
date Tue, 16 Jan 2007 17:46:26 +0000
parents 4aa24216f71a
children 0271b214458b
comparison
equal deleted inserted replaced
4353:d9cd0e5255d7 4354:d18568fb0187
8065 case NAL_DPC: 8065 case NAL_DPC:
8066 init_get_bits(&h->inter_gb, ptr, bit_length); 8066 init_get_bits(&h->inter_gb, ptr, bit_length);
8067 h->inter_gb_ptr= &h->inter_gb; 8067 h->inter_gb_ptr= &h->inter_gb;
8068 8068
8069 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning 8069 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning
8070 && s->context_initialized
8070 && s->hurry_up < 5 8071 && s->hurry_up < 5
8071 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc) 8072 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc)
8072 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE) 8073 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE)
8073 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE) 8074 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE)
8074 && avctx->skip_frame < AVDISCARD_ALL) 8075 && avctx->skip_frame < AVDISCARD_ALL)