highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/msmpeg4: Make ff_msmpeg4_common_init() thread-safe

Browse Source 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-12-10 05:37:54 +01:00
committed by Andreas Rheinhardt
parent 929107c751
commit 26798932ae
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/msmpeg4.c
View File

@@ -27,6 +27,8 @@
* MSMPEG4 backend for encoder and decoder * MSMPEG4 backend for encoder and decoder
*/ */
#include "libavutil/thread.h"
#include "avcodec.h" #include "avcodec.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "mpegvideo.h" #include "mpegvideo.h"
@@ -53,9 +55,6 @@ static av_cold void init_h263_dc_for_msmpeg4(void)
{ {
int level, uni_code, uni_len; int level, uni_code, uni_len;
if(ff_v2_dc_chroma_table[255 + 256][1])
return;
for(level=-256; level<256; level++){ for(level=-256; level<256; level++){
int size, v, l; int size, v, l;
/* find number of bits */ /* 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) av_cold void ff_msmpeg4_common_init(MpegEncContext *s)
{ {
static AVOnce init_static_once = AV_ONCE_INIT;
switch(s->msmpeg4_version){ switch(s->msmpeg4_version){
case 1: case 1:
case 2: 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 //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 */ /* predict coded block */