diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 22:45:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 22:45:43 +0200 |
| commit | 8c22bea57447880f2cf20abee9a97578545ae4fa (patch) | |
| tree | 9341b29c1cfe44fc97efb1ba0f07ae40cc5cccc4 /libavcodec/vp8.c | |
| parent | 1fd0e9a56d757a365492d3329ffe1c49e61d47f6 (diff) | |
avcodec/vp8: Fix multiple ff_thread_finish_setup() calls
Fixes Ticket3725
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp8.c')
| -rw-r--r-- | libavcodec/vp8.c | 3 |
1 files changed, 2 insertions, 1 deletions
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]; |