lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new.
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>
Sun, 25 Aug 2019 14:12:28 +0000 (16:12 +0200)
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>
Tue, 1 Oct 2019 20:07:11 +0000 (22:07 +0200)
Usage of strtok() was removed from x264, see also b02490a4

libavcodec/libx264.c

index 8788286..bfd91bb 100644 (file)
@@ -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