diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-11 16:54:13 +0300 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-18 22:06:53 +0300 |
| commit | 3e0b6f42e3b354b943627a244f0cabb7be07db1b (patch) | |
| tree | 1edd08e76e8f70d6c14d52bc7bac634d9d9fa6c0 /libavcodec/rv40.c | |
| parent | 422e937586e5e672297a9f4b5605ec2718779e1b (diff) | |
avcodec/rv40: Make decoder init-threadsafe
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/rv40.c')
| -rw-r--r-- | libavcodec/rv40.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 9cec0751e1..868d28096e 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -27,6 +27,7 @@ #include "config.h" #include "libavutil/imgutils.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "internal.h" @@ -555,14 +556,13 @@ static void rv40_loop_filter(RV34DecContext *r, int row) */ static av_cold int rv40_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; RV34DecContext *r = avctx->priv_data; int ret; r->rv30 = 0; if ((ret = ff_rv34_decode_init(avctx)) < 0) return ret; - if(!aic_top_vlc.bits) - rv40_init_tables(); r->parse_slice_header = rv40_parse_slice_header; r->decode_intra_types = rv40_decode_intra_types; r->decode_mb_info = rv40_decode_mb_info; @@ -570,6 +570,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx) r->luma_dc_quant_i = rv40_luma_dc_quant[0]; r->luma_dc_quant_p = rv40_luma_dc_quant[1]; ff_rv40dsp_init(&r->rdsp); + ff_thread_once(&init_static_once, rv40_init_tables); return 0; } @@ -590,5 +591,6 @@ const AVCodec ff_rv40_decoder = { AV_PIX_FMT_NONE }, .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), - .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_ALLOCATE_PROGRESS, }; |