Browse Source

Avoid calling decode_slice when context_initialized is not set.

Avoids a crash due to dsp.clear_blocks being NULL when called.

Originally committed as revision 7547 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Reimar Döffinger 19 years ago
parent
commit
b18e5c031c
1 changed files with 1 additions and 0 deletions
  1. +1
    -0
      libavcodec/h264.c

+ 1
- 0
libavcodec/h264.c View File

@@ -8067,6 +8067,7 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
h->inter_gb_ptr= &h->inter_gb;

if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning
&& s->context_initialized
&& s->hurry_up < 5
&& (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc)
&& (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE)


Loading…
Cancel
Save