From 87b7e141a6fda7f450aff4560b776d546af313ed Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 25 Aug 2019 16:12:28 +0200 Subject: [PATCH] lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new. Usage of strtok() was removed from x264, see also b02490a4 --- libavcodec/libx264.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 8788286fae..bfd91bb900 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1180,7 +1180,11 @@ AVCodec ff_libx264_encoder = { .priv_class = &x264_class, .defaults = x264_defaults, .init_static_data = X264_init_static, +#if X264_BUILD >= 158 + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, +#else .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, +#endif .wrapper_name = "libx264", }; #endif @@ -1207,7 +1211,11 @@ AVCodec ff_libx264rgb_encoder = { .priv_class = &rgbclass, .defaults = x264_defaults, .pix_fmts = pix_fmts_8bit_rgb, +#if X264_BUILD >= 158 + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, +#else .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, +#endif .wrapper_name = "libx264", }; #endif