summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-09-08 10:16:34 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-09-08 10:16:34 +0200
commit84c9bf62b42c5505ada727817954a0a41463ccac (patch)
tree1bf5656958934fd9ed330655d4c257e7da72865d /libavcodec
parent617d53f4c7e43b5df6f99b363b550ff7b0007c6e (diff)
lavc/dxv: Silence "Multiple ff_thread_finish_setup() calls" warnings.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/dxv.c3
1 files changed, 2 insertions, 1 deletions
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,