mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
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
This commit is contained in:
parent
b0642c7409
commit
b18e5c031c
@ -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…
Reference in New Issue
Block a user