From patchwork Tue Sep 6 04:11:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kalinkin X-Patchwork-Id: 454 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp691117vsd; Tue, 6 Sep 2016 10:05:51 -0700 (PDT) X-Received: by 10.194.65.100 with SMTP id w4mr17161858wjs.149.1473181551275; Tue, 06 Sep 2016 10:05:51 -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 g5si7267263wjp.278.2016.09.06.10.05.45; Tue, 06 Sep 2016 10:05:51 -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 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 0C91B68A03E; Tue, 6 Sep 2016 20:05:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 629E9689C67 for ; Tue, 6 Sep 2016 07:11:14 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id w207so16387578wmw.0 for ; Mon, 05 Sep 2016 21:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pWX6XOM//vUMZC5EbO2vqmQGexgky7GgaR9KdhjisG4=; b=DVtWonbKvwWHEOgB3b0pMnpA3unyTv4d88+hreWCaD2hImDzDX5OatfrbJZremrs7g YTxZZpCYdhr4JjIEfjBwEQDToP6aQIajUZw5auIJd/xtQScyGfsKk/iLlqWz0BVYnSoT tW+PncALDOy1daAeRE+ovGeY2sRJlpzxfG7PhVBInHStzQxI76CcFuEnzlnubzGujyTz seH7NeKR/UjnsWC5lioGtNRef6DxEBvBBL5A47xCtr/tXkC9Kj/+839oZDamd/8L9Nfv hNP+FJo6bEUL1AekLKI8oYaMWF39kD2Psa+b0lFrCBuBFDiUaxFA60M/QFsuL+Q48QEG j2Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pWX6XOM//vUMZC5EbO2vqmQGexgky7GgaR9KdhjisG4=; b=fgvww8UoS5dvAFlKcgSH3ys6VIPC59ad4uZovguKAvll1u0M+MrbPniVgLxWQ5OP4+ TufKnFgEMHK6FMcSyiymLeP47WjvVkcRagiJNavGkWwciffkSCp+V1eQwHZIXpZ88O1j 6AYRGtooLsqZZSNNPf964VWDmhTHXYSw7nLbPIxTrGXCfXgoOGIO8VGIgrDzp7uw1U/B pl2ORMdphBooq6rBZOdHxZWpOxHd+nRP6GFOqRQCFX1MEyTH10ix3GbmCPBbyhtkIYG0 +ROxodXg0OZNnXU1sb7FR/LFBCcS3N+Aydo2YzrdD5qjsF71pB5DUnaTIKvy8M+Xyfii 6lGQ== X-Gm-Message-State: AE9vXwPk4Ao1u1geKiIZlVYWMtCEi4UeClbWbx6kKvLZEHZvdfAoIlyc/g+JlKTNZtHFaQ== X-Received: by 10.194.102.227 with SMTP id fr3mr8998356wjb.147.1473135083143; Mon, 05 Sep 2016 21:11:23 -0700 (PDT) Received: from lists.aspid.ru (lists.aspid.ru. [146.185.144.154]) by smtp.gmail.com with ESMTPSA id k2sm21024218wmg.23.2016.09.05.21.11.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 21:11:22 -0700 (PDT) From: Dmitry Kalinkin To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Sep 2016 07:11:17 +0300 Message-Id: <1473135077-12768-1-git-send-email-dmitry.kalinkin@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1473134336-12282-1-git-send-email-dmitry.kalinkin@gmail.com> References: <1473134336-12282-1-git-send-email-dmitry.kalinkin@gmail.com> X-Mailman-Approved-At: Tue, 06 Sep 2016 20:05:25 +0300 Subject: [FFmpeg-devel] [PATCHv2] lavc/audiotoolboxdec: fix OSX SDK detection 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: Dmitry Kalinkin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" __MAC_10_11 can be present in updated revision of an older SDK so it can't reliably detect availability of kAudioFormatEnhancedAC3 constant. Fixes: b4daa2c40f ('lavc/audiotoolboxdec: add eac3 decoder') Cc: Rodger Combs Signed-off-by: Dmitry Kalinkin --- libavcodec/audiotoolboxdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 1097668..bf06cf9 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -32,7 +32,7 @@ #include "libavutil/opt.h" #include "libavutil/log.h" -#ifndef __MAC_10_11 +#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 #define kAudioFormatEnhancedAC3 'ec-3' #endif