From d525dbb41f5236ed2dc74041e9db7022bcb5bb86 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 30 Jan 2024 21:42:37 +0100 Subject: [PATCH] avcodec/vp8: Change criterion for calling ff_thread_finish_setup() The current criterion is to check for the existence of update_thread_context. Change this to check for whether we are actually decoding VP8 (and not VP7 or VP8-in-WebP). This is equivalent to the current criterion, but allows the WebP decoder to evolve and to get its own update_thread_context. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 6b49ec9fe7..dd6c1b361b 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2754,7 +2754,7 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, s->next_framep[VP8_FRAME_CURRENT] = curframe; - if (ffcodec(avctx->codec)->update_thread_context) + if (!is_vp7 && !s->actually_webp) ff_thread_finish_setup(avctx); if (avctx->hwaccel) {