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

Zhao Zhili git at videolan.org
Thu Nov 28 19:50:44 EET 2019


ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Thu Nov 14 12:29:55 2019 +0800| [ed5cdf3d5a7eae4e9f399520989c157cfb50fa51] | committer: Michael Niedermayer

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 at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

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);



More information about the ffmpeg-cvslog mailing list