avcodec/vp8: Fix multiple ff_thread_finish_setup() calls
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 20:45:43 +0000 (22:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 20:45:43 +0000 (22:45 +0200)
Fixes Ticket3725

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vp8.c

index 79c401d..b364743 100644 (file)
@@ -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];