virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-14 22:15:12 +02:00
Code Issues Releases Activity

h264dec: do not call finish_setup() if we have not started a frame

Browse Source 
Found-By: Jan Ruge <jan.s.ruge@gmail.com>
Bug-Id: 952
This commit is contained in:
Anton Khirnov
2016-07-20 09:41:35 +02:00
parent 76f7e70aa0
commit e344e65109
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264dec.c
View File

@ -557,7 +557,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size)
break; break;
if (avctx->active_thread_type & FF_THREAD_FRAME && !h->avctx->hwaccel && if (avctx->active_thread_type & FF_THREAD_FRAME && !h->avctx->hwaccel &&
i >= nals_needed && !h->setup_finished) { i >= nals_needed && !h->setup_finished && h->cur_pic_ptr) {
ff_thread_finish_setup(avctx); ff_thread_finish_setup(avctx);
h->setup_finished = 1; h->setup_finished = 1;
} }