From patchwork Wed Mar 22 23:34:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3069 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp543759vsy; Wed, 22 Mar 2017 16:35:52 -0700 (PDT) X-Received: by 10.28.5.8 with SMTP id 8mr9640346wmf.70.1490225752047; Wed, 22 Mar 2017 16:35:52 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w39si4374386wrc.140.2017.03.22.16.35.51; Wed, 22 Mar 2017 16:35:52 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E9FF689756; Thu, 23 Mar 2017 01:34:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73B5D68973B for ; Thu, 23 Mar 2017 01:34:36 +0200 (EET) Received: by mail-qk0-f194.google.com with SMTP id o135so28119609qke.2 for ; Wed, 22 Mar 2017 16:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=MWmjo98XF8R+0rCxn1pgAvO39Q+OaH0hn9DyJlTcfqQ=; b=QOXcCDngIKA9rJMm2EwcbRgj+iqyO4dq7HyXqRXnPFho5360cfKd5+HADKPQOYceKb sBworzQTWHLnoXtmz6Dc7jr+PjxrF1tU5jMPBmIA/HTXUlfQM2Zs6eegg3FjcCqRnmI6 QErodvmBmWSFsyXlBllsHYgDu3GlGBAyhIgp2ATrpnPkED/TaFzB6bv+r0DYV0v5NOZs jgitc7Knxn0BDGgn75oJLhMB0f4gdOMu8Yl6GWR6WuMQb8AdlK06dUxsi22MAhKe+gBB oUHlj+tNrFOHijbNU5pUg3Ss9QwyLqL/FeUp88ekMKeIXchYvnXN/5sr5byEXS4Ly3TJ akkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=MWmjo98XF8R+0rCxn1pgAvO39Q+OaH0hn9DyJlTcfqQ=; b=Ez1dKxoT1XBQMbQRhzZ51gso+CQ2R9GRR+3yJmANn980WVLd4eif9atooZ9GQfoqxV SMNLN47KmW82yw5Af0QTnZ8HUDygKuMEtdidcqYaHgJ/x1969y6WY+3hQPHyahUGy530 aIkTtTSWeciV0FOaQot3cll5CX4z+pCcLU0QC7TfvULFG5/h+ED1cF1jPKLKd8h4Yeoo d/R5b6XhBtM5+iPn5xNAh9z95oW5CBdy/x36GCer/5fF/3RM8ywWcTfH/YE8KFFAby34 aQTeerDKSyealepWrANfLQFffP4XROsbnkrT4VSqfhNwBY4hBbMepfEtvT7o18mJyTAL cFOQ== X-Gm-Message-State: AFeK/H16Rij5Vns6rUN1H6y5zMDkLgosqzoydEexvwqpfr9ZuDGQe/NvIyZnRBKsExbzBg== X-Received: by 10.55.215.86 with SMTP id m83mr7616043qki.150.1490225694389; Wed, 22 Mar 2017 16:34:54 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id w55sm2055133qtw.9.2017.03.22.16.34.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 16:34:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Mar 2017 20:34:10 -0300 Message-Id: <20170322233412.6952-6-jamrial@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170322233412.6952-1-jamrial@gmail.com> References: <20170322233412.6952-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/7] avfilter/avfilter: convert to stdatomic 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavfilter/avfilter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b431990edc..049c5ff47c 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/atomic.h" +#include + #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/buffer.h" @@ -580,13 +581,14 @@ AVFilter *avfilter_get_by_name(const char *name) int avfilter_register(AVFilter *filter) { AVFilter **f = last_filter; + const AVFilter *cmp = NULL; /* the filter must select generic or internal exclusively */ av_assert0((filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE) != AVFILTER_FLAG_SUPPORT_TIMELINE); filter->next = NULL; - while(*f || avpriv_atomic_ptr_cas((void * volatile *)f, NULL, filter)) + while(*f || !atomic_compare_exchange_strong(f, &cmp, filter)) f = &(*f)->next; last_filter = &filter->next;