aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-12-01 16:49:02 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-05-02 05:14:42 +0200
commit1c7e52f8fff36bd67917cdc3fe9f523258659cbc (patch)
treea9480637579de781cc58f23ca84821ea51c731a8
parenta380343c759861dd958316f5d64e2d668610aa33 (diff)
downloadffmpeg-1c7e52f8fff36bd67917cdc3fe9f523258659cbc.tar.gz
avcodec: Mark ff_ass_subtitle_header based decoders as init-threadsafe
ff_ass_subtitle_header_full() just uses av_asprintf() and is therefore thread-safe itself. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavcodec/ccaption_dec.c2
-rw-r--r--libavcodec/jacosubdec.c2
-rw-r--r--libavcodec/microdvddec.c2
-rw-r--r--libavcodec/movtextdec.c2
-rw-r--r--libavcodec/mpl2dec.c2
-rw-r--r--libavcodec/realtextdec.c2
-rw-r--r--libavcodec/samidec.c2
-rw-r--r--libavcodec/srtdec.c3
-rw-r--r--libavcodec/subviewerdec.c2
-rw-r--r--libavcodec/textdec.c6
-rw-r--r--libavcodec/webvttdec.c2
11 files changed, 27 insertions, 0 deletions
diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c
index 9ad00cb254..de05d037a8 100644
--- a/libavcodec/ccaption_dec.c
+++ b/libavcodec/ccaption_dec.c
@@ -21,6 +21,7 @@
#include "avcodec.h"
#include "ass.h"
+#include "internal.h"
#include "libavutil/opt.h"
#define SCREEN_ROWS 15
@@ -952,4 +953,5 @@ const AVCodec ff_ccaption_decoder = {
.decode = decode,
.priv_class = &ccaption_dec_class,
.capabilities = AV_CODEC_CAP_DELAY,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/jacosubdec.c b/libavcodec/jacosubdec.c
index 4054612a3d..698895a86b 100644
--- a/libavcodec/jacosubdec.c
+++ b/libavcodec/jacosubdec.c
@@ -26,6 +26,7 @@
#include <time.h>
#include "ass.h"
+#include "internal.h"
#include "jacosub.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
@@ -202,4 +203,5 @@ const AVCodec ff_jacosub_decoder = {
.decode = jacosub_decode_frame,
.flush = ff_ass_decoder_flush,
.priv_data_size = sizeof(FFASSDecoderContext),
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/microdvddec.c b/libavcodec/microdvddec.c
index 777445997b..c45fe043bf 100644
--- a/libavcodec/microdvddec.c
+++ b/libavcodec/microdvddec.c
@@ -31,6 +31,7 @@
#include "libavutil/bprint.h"
#include "avcodec.h"
#include "ass.h"
+#include "internal.h"
static int indexof(const char *s, int c)
{
@@ -377,4 +378,5 @@ const AVCodec ff_microdvd_decoder = {
.decode = microdvd_decode_frame,
.flush = ff_ass_decoder_flush,
.priv_data_size = sizeof(FFASSDecoderContext),
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index 873c1350a4..4e14ae5900 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -28,6 +28,7 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "bytestream.h"
+#include "internal.h"
#define STYLE_FLAG_BOLD (1<<0)
#define STYLE_FLAG_ITALIC (1<<1)
@@ -593,4 +594,5 @@ const AVCodec ff_movtext_decoder = {
.decode = mov_text_decode_frame,
.close = mov_text_decode_close,
.flush = mov_text_flush,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/mpl2dec.c b/libavcodec/mpl2dec.c
index 3ad094b97a..61e47050ec 100644
--- a/libavcodec/mpl2dec.c
+++ b/libavcodec/mpl2dec.c
@@ -27,6 +27,7 @@
#include "avcodec.h"
#include "ass.h"
+#include "internal.h"
#include "libavutil/bprint.h"
static int mpl2_event_to_ass(AVBPrint *buf, const char *p)
@@ -90,4 +91,5 @@ const AVCodec ff_mpl2_decoder = {
.init = ff_ass_subtitle_header_default,
.flush = ff_ass_decoder_flush,
.priv_data_size = sizeof(FFASSDecoderContext),
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/realtextdec.c b/libavcodec/realtextdec.c
index d469a1981b..11b586d493 100644
--- a/libavcodec/realtextdec.c
+++ b/libavcodec/realtextdec.c
@@ -26,6 +26,7 @@
#include "avcodec.h"
#include "ass.h"
+#include "internal.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
@@ -83,4 +84,5 @@ const AVCodec ff_realtext_decoder = {
.init = ff_ass_subtitle_header_default,
.flush = ff_ass_decoder_flush,
.priv_data_size = sizeof(FFASSDecoderContext),
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c
index 62272f119b..32d07447b4 100644
--- a/libavcodec/samidec.c
+++ b/libavcodec/samidec.c
@@ -28,6 +28,7 @@
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
#include "htmlsubtitles.h"
+#include "internal.h"
typedef struct {
AVBPrint source;
@@ -190,4 +191,5 @@ const AVCodec ff_sami_decoder = {
.close = sami_close,
.decode = sami_decode_frame,
.flush = sami_flush,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c
index c2afb006f3..4f16226b83 100644
--- a/libavcodec/srtdec.c
+++ b/libavcodec/srtdec.c
@@ -26,6 +26,7 @@
#include "avcodec.h"
#include "ass.h"
#include "htmlsubtitles.h"
+#include "internal.h"
static int srt_to_ass(AVCodecContext *avctx, AVBPrint *dst,
const char *in, int x1, int y1, int x2, int y2)
@@ -97,6 +98,7 @@ const AVCodec ff_srt_decoder = {
.decode = srt_decode_frame,
.flush = ff_ass_decoder_flush,
.priv_data_size = sizeof(FFASSDecoderContext),
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
#endif
@@ -110,5 +112,6 @@ const AVCodec ff_subrip_decoder = {
.decode = srt_decode_frame,
.flush = ff_ass_decoder_flush,
.priv_data_size = sizeof(FFASSDecoderContext),
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
#endif
diff --git a/libavcodec/subviewerdec.c b/libavcodec/subviewerdec.c
index 35c1ad78dd..5c650d0cde 100644
--- a/libavcodec/subviewerdec.c
+++ b/libavcodec/subviewerdec.c
@@ -26,6 +26,7 @@
#include "avcodec.h"
#include "ass.h"
+#include "internal.h"
#include "libavutil/bprint.h"
static int subviewer_event_to_ass(AVBPrint *buf, const char *p)
@@ -74,4 +75,5 @@ const AVCodec ff_subviewer_decoder = {
.init = ff_ass_subtitle_header_default,
.flush = ff_ass_decoder_flush,
.priv_data_size = sizeof(FFASSDecoderContext),
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/textdec.c b/libavcodec/textdec.c
index c1fcc5c6cb..becbab601c 100644
--- a/libavcodec/textdec.c
+++ b/libavcodec/textdec.c
@@ -25,6 +25,7 @@
#include "avcodec.h"
#include "ass.h"
+#include "internal.h"
#include "libavutil/bprint.h"
#include "libavutil/opt.h"
@@ -91,6 +92,7 @@ const AVCodec ff_text_decoder = {
.init = ff_ass_subtitle_header_default,
.priv_class = &text_decoder_class,
.flush = text_flush,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
#endif
@@ -117,6 +119,7 @@ const AVCodec ff_vplayer_decoder = {
.init = linebreak_init,
.priv_class = &vplayer_decoder_class,
.flush = text_flush,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
#endif
@@ -134,6 +137,7 @@ const AVCodec ff_stl_decoder = {
.init = linebreak_init,
.priv_class = &stl_decoder_class,
.flush = text_flush,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
#endif
@@ -151,6 +155,7 @@ const AVCodec ff_pjs_decoder = {
.init = linebreak_init,
.priv_class = &pjs_decoder_class,
.flush = text_flush,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
#endif
@@ -168,6 +173,7 @@ const AVCodec ff_subviewer1_decoder = {
.init = linebreak_init,
.priv_class = &subviewer1_decoder_class,
.flush = text_flush,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
#endif
diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c
index eb0a5600a6..0093f328fa 100644
--- a/libavcodec/webvttdec.c
+++ b/libavcodec/webvttdec.c
@@ -27,6 +27,7 @@
#include "avcodec.h"
#include "ass.h"
+#include "internal.h"
#include "libavutil/bprint.h"
static const struct {
@@ -107,4 +108,5 @@ const AVCodec ff_webvtt_decoder = {
.init = ff_ass_subtitle_header_default,
.flush = ff_ass_decoder_flush,
.priv_data_size = sizeof(FFASSDecoderContext),
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};