diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 79c401d354..b364743564 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -2584,7 +2584,8 @@ int vp78_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 
     s->next_framep[VP56_FRAME_CURRENT] = curframe;
 
-    ff_thread_finish_setup(avctx);
+    if (avctx->codec->update_thread_context)
+        ff_thread_finish_setup(avctx);
 
     s->linesize   = curframe->tf.f->linesize[0];
     s->uvlinesize = curframe->tf.f->linesize[1];