From patchwork Mon Nov 27 04:44:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 6394 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1222913jah; Sun, 26 Nov 2017 20:44:29 -0800 (PST) X-Google-Smtp-Source: AGs4zMZXzXaVRH//OnH2LIeTjh0neBWqWuiRyyMzi/lXqY07PDvtjvG4C5yOYapMD4YWnpHtTsqX X-Received: by 10.28.234.80 with SMTP id i77mr14348745wmh.76.1511757869688; Sun, 26 Nov 2017 20:44:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511757869; cv=none; d=google.com; s=arc-20160816; b=p4B59Sh+cs8vSotcX+GBpRGJckeYc7wXWp/QpRSasVQimGzuBh9W0aDXFoFrVqA6nV SlRjwc81iqtg1P4Mg5UAGqFQMmtdUEeWoz6AU1IPav8CdiIG4jbGcpb3VYuEsbVRQrua /xyhYyuE9Ky6Tg4HkF8l2G892yXj08KqM+syjFz31nI6LMEQLP6EF2MeoDuFETd68ht4 spo3Kfx6J6MToCk1EtPcrWCZhiVOmvH+0Z3ggCLX55uaCF0acMNP8ZMKpzpptZTt5mv4 PxUyXIi+c8Kc1Yvf2IKmWfCXc3M097mn5BM23rwphnjvBnKYQ5/Q+/yC9gohZ0X17XCg 3VeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=zwqL9adtQ3KWD7XKoCD1E1FidUDGcS9Mmbc4umHa4sM=; b=Mkm0qPYBng1If14dxsOWhRHB4ljYrQBucom9s+JTbcQwiDbkGq/pkPRyoH6EoDHE+i CHvb+DMngLtOFGC8Ngglf+uVMXKAL0zhERC6b/5omOVz+pb6dNx8Gt2NEzA+3CKhp/1b wDIOtZJUPj/2ti/im5mzKcOax5ClTFsXwvwUWDyFicJ7yyxaMkYRnG/754xt+oBUY/zB YKw5CopirPTUos9pgQQuGWnKtcf0UQT5SByDzRNvcrKIoQy2WMFIgxZDuNZpyhIhkIUw m1viA3PfCeZDe6xf5Yod2IsHs8+z1lt9uBrjBSdRF8S3GZNerDwWQ16Kydm1gOXLPjcH YIDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=j+NVxdCe; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e191si10815070wme.68.2017.11.26.20.44.29; Sun, 26 Nov 2017 20:44:29 -0800 (PST) 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 header.s=20161025 header.b=j+NVxdCe; 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 99FAE689F3A; Mon, 27 Nov 2017 06:44:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 543E768825F for ; Mon, 27 Nov 2017 06:44:20 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id x63so32001757wmf.4 for ; Sun, 26 Nov 2017 20:44:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Yjn8S7EPoWf4WC58L/0wmg8mTDTaP2bMSASbC+XV4XY=; b=j+NVxdCexzD4/8sO45RlPsbzBEkCm8FT266vLN0EKWqAym84Hwm6jjwOQRcA8/tOH3 3PCjHTLMLJfOBMmdTC0VOe0LZ3S0w0MCGdJiQk/4t90rdlHIfz62JLoI1GxuEt8z/Uqf 5PPUWA9A6yN3PWUvSac6I5nuwWo+/s5QTK+YCnqpnpfrj9uaXaNwfTRd56V4rYUPeJQG oPrlif5v5TM34ZHLXHDf0Q3sAF4elZJLWsJeKQ7DNxsRUYS569f8rBSh3OxuITRStQ+h S1HIgNeEaLgR2U6NOmR/op0SVisPettTGdnse/KH7I9aw8DDWNcADzV3ZxRHV/vya8Vb i1tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Yjn8S7EPoWf4WC58L/0wmg8mTDTaP2bMSASbC+XV4XY=; b=EOuClDka3NoudHfcCr4n1ERT9iIl2MmeTnnkn19Po1nv272FSDh52Ju7FdTopCbKJy C0HS7Hgrvq5ePksnY9p6ZhNvqWe+Ur2WP0w2A6ssHoWK5Md8cHRQllz+jaskFPzfNeaR 58D5Dz7OlZGl22queLgDQB1m/JsQbqI01Vy9WeNvcMpNBi62zWXmFNYurJctoXtXfeDf VX/eWCRyXBqPjao8If8LfYeCAmUxKpe2lQfl8fY+o0uOWk5kocvBqy+GiuIljdleNJB9 L0/I3SS0Lfr6qRj9xFnnSZQsUKkZRdppBFiZ+0aZ6kROZl+gj+nYZWuSI1opQRvaax8U n5Fw== X-Gm-Message-State: AJaThX4eIRBbR3VRPLmJRn/UFu3CfQPpyfBcuEYxiHe7usCPGl464tvD nSDTSlGlGHINBNATEg/u3FJk0b+p X-Received: by 10.28.193.139 with SMTP id r133mr16936822wmf.39.1511757861733; Sun, 26 Nov 2017 20:44:21 -0800 (PST) Received: from moonbase.pars.ee ([2a00:23c4:7c83:f700:5813:5124:6fa1:dad9]) by smtp.gmail.com with ESMTPSA id h194sm34358188wma.3.2017.11.26.20.44.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Nov 2017 20:44:20 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 04:44:19 +0000 Message-Id: <20171127044419.20562-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.15.0.417.g466bffb3ac Subject: [FFmpeg-devel] [PATCH] lavc/utils: simplify lockmgr 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Again, totally unneded use of the atomic function to set/NULL a local variable. Signed-off-by: Rostislav Pehlivanov --- libavcodec/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index de2dcea54d..17388ef637 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -26,7 +26,6 @@ */ #include "config.h" -#include "libavutil/atomic.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" @@ -85,9 +84,11 @@ static int default_lockmgr_cb(void **arg, enum AVLockOp op) av_free(tmp); return AVERROR(err); } - if (avpriv_atomic_ptr_cas(mutex, NULL, tmp)) { + if (*mutex) { pthread_mutex_destroy(tmp); av_free(tmp); + } else { + *mutex = tmp; } } @@ -103,8 +104,7 @@ static int default_lockmgr_cb(void **arg, enum AVLockOp op) case AV_LOCK_DESTROY: if (*mutex) pthread_mutex_destroy(*mutex); - av_free(*mutex); - avpriv_atomic_ptr_cas(mutex, *mutex, NULL); + av_freep(*mutex); return 0; } return 1;