From 84c9bf62b42c5505ada727817954a0a41463ccac Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Tue, 8 Sep 2015 10:16:34 +0200
Subject: lavc/dxv: Silence "Multiple ff_thread_finish_setup() calls" warnings.

---
 libavcodec/dxv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libavcodec/dxv.c')

diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index b0e252b9ab..69bd2a1e20 100644
--- a/libavcodec/dxv.c
+++ b/libavcodec/dxv.c
@@ -397,7 +397,8 @@ static int dxv_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);
 
     /* Now decompress the texture with the standard functions. */
     avctx->execute2(avctx, decompress_texture_thread,
-- 
cgit v1.2.3