From patchwork Sun Aug 25 14:55:58 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: 14704 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 A7896448422 for ; Sun, 25 Aug 2019 17:56:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84E3268A8DF; Sun, 25 Aug 2019 17:56:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D640F68A03F for ; Sun, 25 Aug 2019 17:56:10 +0300 (EEST) Received: by mail-io1-f66.google.com with SMTP id j5so31242696ioj.8 for ; Sun, 25 Aug 2019 07:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=gGMqXUKAPu/EUY9RnIUa950KYPOCq20nsVgWdq2L+FI=; b=fX8HvVqgI45KHAazNJTxueK725m9Bkj0nKHXXPYHfvIz1pjioOgPGaEsqqFsyqxwuk 2Et0aY1vinaZBrYOAOCtyaAYCfavBZrx1uM/G6GUp0mHUThdUMExjK4UeydjVWWcbiaU 10f7c+bQtqd9x23ULGE0ApW0AcLOXKk1BsaW94nni0N208GIuBxtpYUBNGLnXwoZqoy/ 9Tw9oShsvDdUZgAgW79Clfz7dcMWGuVYUZojUKZ8WOqjgRJ/GCnhYQsnqHgVdGYD1kVI 03SpBpOkhVBIWja1vQKMbChww9N/4x8BF1/ljkBkUkiYxaN2vG3HRSys/ksMW+NxS5Rj WHbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=gGMqXUKAPu/EUY9RnIUa950KYPOCq20nsVgWdq2L+FI=; b=HjIOLkImXC84hVvI1pOI5qyM0nCHeRyiEVEjpZKov3G4VUmiTZMi5eYYyy3sQkzXCu 8HpEH9FCYwW9PxynF3R1CJP1b0uBYdoskytn4jfdM2PiH4ydT/oFOF2gDOsKEuzcgQd7 lhb+z2eqz4epuUts80QhhP1DcnYtqPLf143UcSEJf/XLmDT7gFYItmJhyNUmMNvUXsJx 5tsk6OAe/D0zb2QW5uEzyuUWiQupdKX8klV2//7CkwzFBiYcEUIW7GOVHDfpmZQ9ZE8u KFovwNTGNzqOczap5iNXHZahob8R4AxsyefrczkPpLQ8xZrBsnFH2aR7/GhiJwD791Jx bQHQ== X-Gm-Message-State: APjAAAXhrUb7MzBgGQdbA12t3gJtgiAoPaareYTEW1inS6Q2esO+B5Zz AN4FySHiP4Uk1rrmUvzlH0CpjdS67a2vW6omwdtWtw== X-Google-Smtp-Source: APXvYqwaeaoDiM+2PkROVxtt8sssZwBZkZfo7FvgiI4kxLIYZe53I3mNvFJIDxiXcggUPc1JAGtQVAHxqun45pdXlvM= X-Received: by 2002:a6b:7e0b:: with SMTP id i11mr17672893iom.211.1566744969279; Sun, 25 Aug 2019 07:56:09 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Carl Eugen Hoyos Date: Sun, 25 Aug 2019 16:55:58 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [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" Am So., 25. Aug. 2019 um 16:15 Uhr schrieb Carl Eugen Hoyos : > > Hi! > > x264 removed the usage of strtok(), using FF_CODEC_CAP_INIT_THREADSAFE > is ok with new libx264. New patch attached. 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,11 @@ AVCodec ff_libx262_encoder = { .priv_class = &X262_class, .defaults = x264_defaults, .pix_fmts = pix_fmts_8bit, +#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