From patchwork Sun Aug 25 14:15:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 14701 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 171AE447DED for ; Sun, 25 Aug 2019 17:16:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4AAD68A9BF; Sun, 25 Aug 2019 17:16:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBA48689F73 for ; Sun, 25 Aug 2019 17:16:09 +0300 (EEST) Received: by mail-io1-f41.google.com with SMTP id o9so31148325iom.3 for ; Sun, 25 Aug 2019 07:16:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=G5JFSZzC5a5EDH4Ui0uBcJhuPKoMi40wKXLymR0pwpE=; b=azV/yHOqGpO7q88Rr9xW0/fyXyf8MUn8BzBPMbO+X6uwLSEURAR/Wh54R1E4uybY5w 9MYXZLdFy/u8cMpkzdSo1bl3Cz4h7cA5z5EzmS643/dOTkTyDmvXqQY6qsv8N5Enu1n7 4j7MVkwZWuqIxpUGNiDwBNsNnaeAxJw7kF6ElG1QLG0HfV9Z0LKdFLFipPsuC0UHefGK iC8MLXSuheccbHM21d36TNJD84FQuCLsEJOO3GReEnpeo8BdG7KRNutvdZTIsdhfw4V2 8uy+esJWhupjnWJEcaFPtGuluhILVcgkzO5hS0hTx4Xiw7b2YrJxYyNsHfjGHH7cp5EQ gzQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=G5JFSZzC5a5EDH4Ui0uBcJhuPKoMi40wKXLymR0pwpE=; b=L7X7tNSRYWCtr3p20UqUn4h1KvnyzA5/PZEMGQrsWjWO8Xr3ev/aZDl6ojrEBRZyTr /kfInRYISaPDLdDTEZXxvVa8PFuGsqcspSwFVnnSb/IjmieIn2d3U5YwZYvckN87x50R pgLnOZAsOKS1/kvpz405sMyoKTBcHcr3+FGmG/yMHHsXigKNNxx6q1SJwYdR/8+tBiQD ZqVRvA/By49CBkOyeUuLlzlVPHWZMkmN7x/qyq8JTiw2ovspjX/iqueGYpU3wJgyEyqt sqDUj5klK3Zdt8D3q1Y3V5J0LHA1L5Jkiwe+8TR9eYP8pGTuuy33s9aPn26O9tS489MF YLkQ== X-Gm-Message-State: APjAAAW+s3CoPUFRSXQntNXfzHdWGjXLnTkWdAsvQ+CQ81+l51YqneuV HJlUzOTyOvdimlKsNSAZrTLPK49ctB/eBw0EZ5XHYg== X-Google-Smtp-Source: APXvYqy6zhcE6Ecx0YBAG1Ai6IcUMLL/BL+Mgg4EHioq0BysJWlxsJouZslBsDx4DPxgruCNKaWJ+ddlLSdVagbe2Dc= X-Received: by 2002:a05:6638:2aa:: with SMTP id d10mr10267732jaq.89.1566742568069; Sun, 25 Aug 2019 07:16:08 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Sun, 25 Aug 2019 16:15:57 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! x264 removed the usage of strtok(), using FF_CODEC_CAP_INIT_THREADSAFE is ok with new libx264. Please comment, Carl Eugen From e65319ab33f9cb2cb3d1db45bbc0fc8e69a80535 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 86e3530e79..1b9043d2cc 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1168,7 +1168,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 @@ -1195,7 +1199,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 @@ -1222,7 +1230,12 @@ AVCodec ff_libx262_encoder = { .priv_class = &X262_class, .defaults = x264_defaults, .pix_fmts = pix_fmts_8bit, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP +#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 -- 2.22.1