Merge commit '32c8d89c036b0e75ece74aea638df587099def0b'

[ffmpeg] / libavcodec / hapdec.c

diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c
index 6e3c138199ff122360fd3f584a7c73c68fe21d39..e6b7d61b92838937a1977d306ff1ee09c66b77e6 100644 (file)
--- a/libavcodec/hapdec.c
+++ b/libavcodec/hapdec.c
@@ -177,7 +177,8 @@ static int hap_decode(AVCodecContext *avctx, void *data,
     ret = ff_thread_get_buffer(avctx, &tframe, 0);
     if (ret < 0)
         return ret;
-    ff_thread_finish_setup(avctx);
+    if (avctx->codec->update_thread_context)
+        ff_thread_finish_setup(avctx);
 
     /* Use the decompress function on the texture, one block per thread */
     avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, blocks);