[FFmpeg-cvslog] avcodec/vp8: Fix multiple ff_thread_finish_setup() calls

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 27 22:45:43 2014 +0200| [8c22bea57447880f2cf20abee9a97578545ae4fa] | committer: Michael Niedermayer

avcodec/vp8: Fix multiple ff_thread_finish_setup() calls

Fixes Ticket3725

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c22bea57447880f2cf20abee9a97578545ae4fa
---

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

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 79c401d..b364743 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];