Avoid calling decode_slice when context_initialized is not set.
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Tue, 16 Jan 2007 17:46:26 +0000 (17:46 +0000)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Tue, 16 Jan 2007 17:46:26 +0000 (17:46 +0000)
Avoids a crash due to dsp.clear_blocks being NULL when called.

Originally committed as revision 7547 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.c

index 451a2af5bcb0db74ca602b17c13f47763a834c7a..2acab45b1779fd407119f550005ff333d9f17bb8 100644 (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)