From patchwork Tue Sep 6 03:58:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kalinkin X-Patchwork-Id: 453 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp691034vsd; Tue, 6 Sep 2016 10:05:42 -0700 (PDT) X-Received: by 10.28.51.21 with SMTP id z21mr20662013wmz.24.1473181542638; Tue, 06 Sep 2016 10:05:42 -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 d10si15798855wmc.14.2016.09.06.10.05.36; Tue, 06 Sep 2016 10:05:42 -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 973B268A036; Tue, 6 Sep 2016 20:05:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30C6C689D4A for ; Tue, 6 Sep 2016 07:14:13 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id w207so16394684wmw.0 for ; Mon, 05 Sep 2016 21:14:22 -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; bh=6WeUx9IAKmR4jTobnGY9FIHGdUh2auOjm5cDBtaCUUY=; b=CH/99zlT6vmZm5nSSXOodP4tc6bl2vNPDOekbGviPV1ioFyKWMoDE4X+IPF9/RXjIv gorYFpbziKU11iUGkq0rfI9kOaY1FX3j86YI8yNFm3LOihuq85dUJdrcBv+mAKdLLnG3 HksjlkdEyR3p36nT3efMvr2sZH20g3DRovcgPuODf0JRRB7Y/QERcKWJC30G9j6pqR5Y SaNc6eQEJM00TJaueLgkXr7JDfdlj7BblagAbMr5gbw6ecaKnVdBgsL1TZp7HP0wi5jC uA+TKnrO29fGJaoEXct460ad+bIQ89Yx59AdK8zPrC3rHREuWIVdV6AWP1cBYq9i0s6e PpKQ== 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; bh=6WeUx9IAKmR4jTobnGY9FIHGdUh2auOjm5cDBtaCUUY=; b=BB6zskbZ96eU8kbb7nneukTr3oXHa2l2m+ShgdvWZb7yW1G1PVSa7z6jzWHOWyxY5e 9PRR1h5lg69UrIcSfXy0EJumYGL6ccZhQxvyGDB0gujKx3q89IIUXblOnkI74TN8SSDP b7bsD8vp+L6/JGIpCab2bm3EczxxCr0f9j7H3870DJCx8DIwQ3MXYrOhMP+ZKpI+bnwC fHnTRZdVQYDwJB0wK1gxAsnOWorx7CeBE2DpQCpUhU12HVOf8Vl2iY8FTEYIJL+CFBQq 8a1fNUQa98J8haMyxRcKi/r6VZpJRkDXXj5cakBraaRBmGlWm8wYXsd6ceFAzOatP7TR qijw== X-Gm-Message-State: AE9vXwNh24mJZlhydiqW4X+cifIpVEncyrLW0SLbewwuRcSYTsSCMHLa/0GCbvLM6ZQoSA== X-Received: by 10.28.111.198 with SMTP id c67mr12858739wmi.34.1473134345120; Mon, 05 Sep 2016 20:59:05 -0700 (PDT) Received: from lists.aspid.ru (lists.aspid.ru. [146.185.144.154]) by smtp.gmail.com with ESMTPSA id g7sm30920338wjx.10.2016.09.05.20.59.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 20:59:04 -0700 (PDT) From: Dmitry Kalinkin To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Sep 2016 06:58:56 +0300 Message-Id: <1473134336-12282-1-git-send-email-dmitry.kalinkin@gmail.com> X-Mailer: git-send-email 2.1.4 X-Mailman-Approved-At: Tue, 06 Sep 2016 20:05:22 +0300 Subject: [FFmpeg-devel] [PATCH] 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..bba6913 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 +#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 #define kAudioFormatEnhancedAC3 'ec-3' #endif