X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Findeo2.c;h=57213082675273c73e6119ecfcffa4220c3d688b;hb=df1c30f139bd4c4d5426d4fc169a1a2c16f95163;hp=7a568bfbc41dec730dacd915d28b96f1495f5e71;hpb=57eee75c3fd075e555df122f1abc45ca636a2726;p=ffmpeg

diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index 7a568bfbc41..57213082675 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -25,6 +25,7 @@
  */
 
 #include "libavutil/attributes.h"
+#include "libavutil/thread.h"
 
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
@@ -46,7 +47,7 @@ static VLC ir2_vlc;
 /* Indeo 2 codes are in range 0x01..0x7F and 0x81..0x90 */
 static inline int ir2_get_code(GetBitContext *gb)
 {
-    return get_vlc2(gb, ir2_vlc.table, CODE_VLC_BITS, 1) + 1;
+    return get_vlc2(gb, ir2_vlc.table, CODE_VLC_BITS, 1);
 }
 
 static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst,
@@ -225,8 +226,16 @@ static int ir2_decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
+static av_cold void ir2_init_static(void)
+{
+    INIT_VLC_STATIC_FROM_LENGTHS(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
+                                 &ir2_tab[0][1], 2, &ir2_tab[0][0], 2, 1,
+                                 0, INIT_VLC_OUTPUT_LE, 1 << CODE_VLC_BITS);
+}
+
 static av_cold int ir2_decode_init(AVCodecContext *avctx)
 {
+    static AVOnce init_static_once = AV_ONCE_INIT;
     Ir2Context * const ic = avctx->priv_data;
 
     ic->avctx = avctx;
@@ -237,9 +246,7 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx)
     if (!ic->picture)
         return AVERROR(ENOMEM);
 
-    INIT_LE_VLC_STATIC(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
-                       &ir2_codes[0][1], 4, 2,
-                       &ir2_codes[0][0], 4, 2, 1 << CODE_VLC_BITS);
+    ff_thread_once(&init_static_once, ir2_init_static);
 
     return 0;
 }
@@ -263,4 +270,5 @@ AVCodec ff_indeo2_decoder = {
     .close          = ir2_decode_end,
     .decode         = ir2_decode_frame,
     .capabilities   = AV_CODEC_CAP_DR1,
+    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
 };