From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Date: Thu, 10 Dec 2020 04:37:54 +0000 (+0100)
Subject: avcodec/msmpeg4: Make ff_msmpeg4_common_init() thread-safe
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=26798932ae13f3505dc50be30f17796c4c8c9e67;hp=929107c75156af9a403882248032a301380c635e;p=ffmpeg

avcodec/msmpeg4: Make ff_msmpeg4_common_init() thread-safe

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---

diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 920f50f32cd..ea1083c1a03 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -27,6 +27,8 @@
  * MSMPEG4 backend for encoder and decoder
  */
 
+#include "libavutil/thread.h"
+
 #include "avcodec.h"
 #include "idctdsp.h"
 #include "mpegvideo.h"
@@ -53,9 +55,6 @@ static av_cold void init_h263_dc_for_msmpeg4(void)
 {
         int level, uni_code, uni_len;
 
-        if(ff_v2_dc_chroma_table[255 + 256][1])
-            return;
-
         for(level=-256; level<256; level++){
             int size, v, l;
             /* find number of bits */
@@ -108,6 +107,8 @@ static av_cold void init_h263_dc_for_msmpeg4(void)
 
 av_cold void ff_msmpeg4_common_init(MpegEncContext *s)
 {
+    static AVOnce init_static_once = AV_ONCE_INIT;
+
     switch(s->msmpeg4_version){
     case 1:
     case 2:
@@ -146,7 +147,7 @@ av_cold void ff_msmpeg4_common_init(MpegEncContext *s)
     }
     //Note the default tables are set in common_init in mpegvideo.c
 
-    init_h263_dc_for_msmpeg4();
+    ff_thread_once(&init_static_once, init_h263_dc_for_msmpeg4);
 }
 
 /* predict coded block */