[FFmpeg-cvslog] avcodec/intrax8: Make ff_intrax8_common_init() thread-safe

Andreas Rheinhardt git at videolan.org
Tue Nov 24 12:49:19 EET 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Nov 16 22:00:34 2020 +0100| [b1af617f519cf7bbae1379473c76cff2b0e55659] | committer: Andreas Rheinhardt

avcodec/intrax8: Make ff_intrax8_common_init() thread-safe

In particular, don't reinitialize VLCs every time an IntraX8Context is
initialized.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavcodec/intrax8.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index 390c10272e..b85653881d 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -22,6 +22,7 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/thread.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "idctdsp.h"
@@ -725,6 +726,8 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
                                    int block_last_index[12],
                                    int mb_width, int mb_height)
 {
+    static AVOnce init_static_once = AV_ONCE_INIT;
+
     w->avctx = avctx;
     w->idsp = *idsp;
     w->mb_width  = mb_width;
@@ -752,7 +755,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
     ff_intrax8dsp_init(&w->dsp);
     ff_blockdsp_init(&w->bdsp, avctx);
 
-    x8_vlc_init();
+    ff_thread_once(&init_static_once, x8_vlc_init);
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list