X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fh261enc.c;h=eec526c5000d34795bb20dcc282dae890f605f92;hb=a240097ecd4fb1639db99e7becb888ae478405cd;hp=315762c10c0f20ea7d649dc8247cc6c3aebba6d5;hpb=398000abcf980d239a789da6f69811913d2fc635;p=ffmpeg

diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c
index 315762c10c0..eec526c5000 100644
--- a/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
+#include "libavutil/thread.h"
 #include "avcodec.h"
 #include "mpegutils.h"
 #include "mpegvideo.h"
@@ -55,7 +56,7 @@ void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number)
     H261Context *h = (H261Context *)s;
     int format, temp_ref;
 
-    avpriv_align_put_bits(&s->pb);
+    align_put_bits(&s->pb);
 
     /* Update the pointer to last GOB */
     s->ptr_lastgob = put_bits_ptr(&s->pb);
@@ -322,8 +323,7 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64],
     }
 }
 
-static av_cold void init_uni_h261_rl_tab(RLTable *rl, uint32_t *bits_tab,
-                                         uint8_t *len_tab)
+static av_cold void init_uni_h261_rl_tab(const RLTable *rl, uint8_t *len_tab)
 {
     int slevel, run, last;
 
@@ -362,9 +362,17 @@ static av_cold void init_uni_h261_rl_tab(RLTable *rl, uint32_t *bits_tab,
     }
 }
 
+static av_cold void h261_encode_init_static(void)
+{
+    static uint8_t h261_rl_table_store[2][2 * MAX_RUN + MAX_LEVEL + 3];
+
+    ff_rl_init(&ff_h261_rl_tcoeff, h261_rl_table_store);
+    init_uni_h261_rl_tab(&ff_h261_rl_tcoeff, uni_h261_rl_len);
+}
+
 av_cold void ff_h261_encode_init(MpegEncContext *s)
 {
-    ff_h261_common_init();
+    static AVOnce init_static_once = AV_ONCE_INIT;
 
     s->min_qcoeff       = -127;
     s->max_qcoeff       = 127;
@@ -372,10 +380,9 @@ av_cold void ff_h261_encode_init(MpegEncContext *s)
     s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
     s->ac_esc_length    = 6+6+8;
 
-    init_uni_h261_rl_tab(&ff_h261_rl_tcoeff, NULL, uni_h261_rl_len);
-
     s->intra_ac_vlc_length      = s->inter_ac_vlc_length      = uni_h261_rl_len;
     s->intra_ac_vlc_last_length = s->inter_ac_vlc_last_length = uni_h261_rl_len + 128*64;
+    ff_thread_once(&init_static_once, h261_encode_init_static);
 }
 
 static const AVClass h261_class = {
@@ -394,6 +401,7 @@ AVCodec ff_h261_encoder = {
     .init           = ff_mpv_encode_init,
     .encode2        = ff_mpv_encode_picture,
     .close          = ff_mpv_encode_end,
+    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
     .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
                                                      AV_PIX_FMT_NONE },
     .priv_class     = &h261_class,