Module: libav Branch: master Commit: e344e65109f1a75ca82aff4cecec44e79197753c
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Wed Jul 20 09:41:35 2016 +0200 h264dec: do not call finish_setup() if we have not started a frame Found-By: Jan Ruge <[email protected]> Bug-Id: 952 --- libavcodec/h264dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 4d1702e..0e318a5 100644 --- 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; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
