提交 e344e651 编写于 作者: A Anton Khirnov

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

Found-By: NJan Ruge <jan.s.ruge@gmail.com>
Bug-Id: 952
上级 76f7e70a
...@@ -557,7 +557,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册