From 1f7b4f9abc6bae94e576e710b8d10117ca3c8238 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 20 Jul 2016 09:59:45 +0200
Subject: [PATCH] h264dec: make sure not to call finish_setup() more than once
per frame
It does not break anything currently, but should not be done anyway.
---
libavcodec/h264dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index 1086eab8d3f..faa502ed099 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -550,7 +550,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) {
+ i >= nals_needed && !h->setup_finished) {
ff_thread_finish_setup(avctx);
h->setup_finished = 1;
}
--
GitLab