From 2a4cedace4d440978aa10757644f2f0f7a80be2f Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 1 Dec 2020 14:15:21 +0100 Subject: avcodec/movtextenc, srtenc, webvttenc: Mark encoders as init-threadsafe They all rely on ff_ass_split(), which does not have any static state. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 2 +- libavcodec/srtenc.c | 4 ++++ libavcodec/webvttenc.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 4e782c7856..383125b4ba 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -718,5 +718,5 @@ const AVCodec ff_movtext_encoder = { .init = mov_text_encode_init, .encode_sub = mov_text_encode_frame, .close = mov_text_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index 346f281af3..edc91c4013 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -25,6 +25,7 @@ #include "libavutil/bprint.h" #include "ass_split.h" #include "ass.h" +#include "internal.h" #define SRT_STACK_SIZE 64 @@ -299,6 +300,7 @@ const AVCodec ff_srt_encoder = { .init = srt_encode_init, .encode_sub = srt_encode_frame, .close = srt_encode_close, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -312,6 +314,7 @@ const AVCodec ff_subrip_encoder = { .init = srt_encode_init, .encode_sub = srt_encode_frame, .close = srt_encode_close, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -325,5 +328,6 @@ const AVCodec ff_text_encoder = { .init = srt_encode_init, .encode_sub = text_encode_frame, .close = srt_encode_close, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index cc47b5aca3..3181e25120 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -26,6 +26,7 @@ #include "libavutil/bprint.h" #include "ass_split.h" #include "ass.h" +#include "internal.h" #define WEBVTT_STACK_SIZE 64 typedef struct { @@ -219,4 +220,5 @@ const AVCodec ff_webvtt_encoder = { .init = webvtt_encode_init, .encode_sub = webvtt_encode_frame, .close = webvtt_encode_close, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; -- cgit v1.2.3