[FFmpeg-cvslog] lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new.

Carl Eugen Hoyos git at videolan.org
Tue Oct 1 23:07:56 EEST 2019


ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Sun Aug 25 16:12:28 2019 +0200| [87b7e141a6fda7f450aff4560b776d546af313ed] | committer: Carl Eugen Hoyos

lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new.

Usage of strtok() was removed from x264, see also b02490a4

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87b7e141a6fda7f450aff4560b776d546af313ed
---

 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



More information about the ffmpeg-cvslog mailing list