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

Found-By: Jan Ruge <jan.s.ruge@gmail.com> Bug-Id: 952
9 years ago · e344e65109
parent 76f7e70aa0
commit e344e65109
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@ -557,7 +557,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size)
                break;

            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);
                h->setup_finished = 1;
            }