diff options
| author | Zhao Zhili <zhilizhao@tencent.com> | 2019-11-14 12:29:55 +0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-28 18:44:01 +0100 |
| commit | ed5cdf3d5a7eae4e9f399520989c157cfb50fa51 (patch) | |
| tree | c8692e945700ba6b5a360bf636dd0d3ecb40b1a5 /libavcodec/vp8.c | |
| parent | 3a6ec10d904f5f9d38900a79281000ca1d0a0747 (diff) | |
| download | ffmpeg-ed5cdf3d5a7eae4e9f399520989c157cfb50fa51.tar.gz | |
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>
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 eb51d1f3c9..b4deb3ed67 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -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); |