Browse Source

avcodec/vp8: fix multiple ff_thread_finish_setup() calls

webp decoder doesn't set update_thread_context field

$ ffmpeg -i rgb_q80.webp -f null -
[webp @ 0x7ffbd5823200] Multiple ff_thread_finish_setup() calls

Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.3
Zhao Zhili Michael Niedermayer 6 years ago
parent
commit
ed5cdf3d5a
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavcodec/vp8.c

+ 2
- 1
libavcodec/vp8.c View File

@@ -2715,7 +2715,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);

if (avctx->hwaccel) {
ret = avctx->hwaccel->start_frame(avctx, avpkt->data, avpkt->size);


Loading…
Cancel
Save