From patchwork Thu Feb 23 10:07:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Turkin X-Patchwork-Id: 2657 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp149636vsf; Thu, 23 Feb 2017 02:15:19 -0800 (PST) X-Received: by 10.223.150.184 with SMTP id u53mr1155036wrb.6.1487844917315; Thu, 23 Feb 2017 02:15:17 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r73si6342251wmb.58.2017.02.23.02.15.15; Thu, 23 Feb 2017 02:15:17 -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; 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 97A0C688312; Thu, 23 Feb 2017 12:15:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F09D6882B8 for ; Thu, 23 Feb 2017 12:14:58 +0200 (EET) Received: by mail-lf0-f66.google.com with SMTP id z127so2374103lfa.2 for ; Thu, 23 Feb 2017 02:15:06 -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=BVRpWAsESSpBkHAw6ikjDP5d2t+rvjiHLQfjeklh3zk=; b=YLkYO+drvpSMaBus25fmft2efjOY8wZVLnKk8cOwXrNplsXtQOPbp9D4NjZTvpaUkw TO2QNa4nAy7HF1hthAUmiVmpWDoXDfSxHg21A5CrgTjXqDVbDphuOFM0zUXzIFazbc+s P5FJot7FP6ZNRjrZrVBf6z9QwsY84sym/DwPDdz++pgAIqwblSi9yFkoB3aREit2oCJ2 zzei7SaMhUxlt52A7ZBtDH43QCAH/YCkXLYT3jsiT36wW3W8pyaKlz6ANir/SHX2jRga mSjn0XTnaaSIbVAnXQGZJJl5ThGSRUiuz3x6UMCrajGgk4LRQoZbRAiFuqJumkZapkmq +j3A== 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=BVRpWAsESSpBkHAw6ikjDP5d2t+rvjiHLQfjeklh3zk=; b=ButiMPV9sDVCoKP+GqIrWqq6DASGp7OXbefU25YGd3+ZxUbwJOd8FHJPsVY5Nvq+LB Ye13P0skNFVyBNMuNZd1KPXSzQ6prkuQBlfidVeyMjohCYOT1Y8aEF7DlybllcQkfSE6 JqBcHYK4r9PIgGNgaUhmgxiUTNcLWBNshk/xU6P7r7ZySjHRoO61jB0QR1g8nl2LnnSi VzHD1fXe2vOOlDXSKvEmBAji1X32Nq0KZyN0uiD3FTmBb3fze4E2CLfYNkdd7vJed6Zn 1yxcaWm17P1M8FduABXMYDfKh9/uSs6Fy12nNF0+AcPA7pZ33pMDFZ4+0stfIGTUiYu4 fxhg== X-Gm-Message-State: AMke39kxHdcSK8hXpQ3Uxlac6olJKeZlzF4Lkt8gQYu4dBXEzACtPqpxugEb5WamvAylng== X-Received: by 10.46.88.85 with SMTP id x21mr10190751ljd.90.1487844484317; Thu, 23 Feb 2017 02:08:04 -0800 (PST) Received: from localhost.localdomain ([149.62.11.24]) by smtp.gmail.com with ESMTPSA id 26sm7762719ljo.21.2017.02.23.02.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Feb 2017 02:08:03 -0800 (PST) From: Andrey Turkin To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Feb 2017 13:07:27 +0300 Message-Id: <20170223100727.26260-1-andrey.turkin@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] Handle build environment where both posix_malloc and _aligned_alloc are available 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: Andrey Turkin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" av_malloc prefers posix_malloc over _aligned_alloc so realloc and free functions must be used when posix_malloc is available. This fixes mingw32 builds when using custom allocators. --- libavutil/mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/mem.c b/libavutil/mem.c index 1a8fc21e98..d0065a09d5 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -162,7 +162,7 @@ void *av_realloc(void *ptr, size_t size) if (ptr) ptr = (char *)ptr + diff; return ptr; -#elif HAVE_ALIGNED_MALLOC +#elif HAVE_ALIGNED_MALLOC && !HAVE_POSIX_MEMALIGN return _aligned_realloc(ptr, size + !size, ALIGN); #else return realloc(ptr, size + !size); @@ -233,7 +233,7 @@ void av_free(void *ptr) av_assert0(v>0 && v<=ALIGN); free((char *)ptr - v); } -#elif HAVE_ALIGNED_MALLOC +#elif HAVE_ALIGNED_MALLOC && !HAVE_POSIX_MEMALIGN _aligned_free(ptr); #else free(ptr);