]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/wnv1: Make decoder init-threadsafe
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Sun, 15 Nov 2020 11:19:55 +0000 (12:19 +0100)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Tue, 8 Dec 2020 16:51:45 +0000 (17:51 +0100)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavcodec/wnv1.c

index 7dd0e72596a109811f7734eaa0591d4806881e9c..dcf417763c98926f6c7770524755e2b5026d5257 100644 (file)
@@ -24,6 +24,8 @@
  * Winnov WNV1 codec.
  */
 
+#include "libavutil/thread.h"
+
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
@@ -112,14 +114,22 @@ static int decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-static av_cold int decode_init(AVCodecContext *avctx)
+static av_cold void wnv1_init_static(void)
 {
-    avctx->pix_fmt = AV_PIX_FMT_YUV422P;
-
     INIT_VLC_STATIC_FROM_LENGTHS(&code_vlc, CODE_VLC_BITS, 16,
                                  &code_tab[0][1], 2,
                                  &code_tab[0][0], 2, 1,
                                  -7, INIT_VLC_OUTPUT_LE, 1 << CODE_VLC_BITS);
+}
+
+static av_cold int decode_init(AVCodecContext *avctx)
+{
+    static AVOnce init_static_once = AV_ONCE_INIT;
+
+    avctx->pix_fmt = AV_PIX_FMT_YUV422P;
+
+    ff_thread_once(&init_static_once, wnv1_init_static);
+
     return 0;
 }
 
@@ -131,4 +141,5 @@ AVCodec ff_wnv1_decoder = {
     .init           = decode_init,
     .decode         = decode_frame,
     .capabilities   = AV_CODEC_CAP_DR1,
+    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
 };