From patchwork Sat Jul 15 15:40:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 42744 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4384126pzb; Sat, 15 Jul 2023 08:41:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlF73CFv9Dbr0cRpRbYK03WHFTFDA5n5gl3mDQ//NJ/FkLfTeK8s9tXZqPwBZSX/tYLKCEKW X-Received: by 2002:aa7:c9d6:0:b0:51e:4fa:14e9 with SMTP id i22-20020aa7c9d6000000b0051e04fa14e9mr6670055edt.29.1689435670763; Sat, 15 Jul 2023 08:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689435670; cv=none; d=google.com; s=arc-20160816; b=NaadKY4VjmixrK83TueyFwzB90M7CJ+U4lTeRerrEbyTvMBW6Uvlj+ZVhBDDkw/QL3 5FDAxCdAnumt00gWqN2E17GqhtBJfVvY28T55RieEEQGAx7vkpBGUIxmXTQIDC0WAklZ rbmXT4YKF2aVGJnJIN0kY0rLbRQQhIx7xuaFJW5uD4Z9EtuQhuShwWN3oYcBYS8bPni/ m2DFWpbMHsW8FeaeBt3CQBqb5/LFBUGKrolEiPxJEsrhMQFItlJrMyHEjZkqNvZ0QBDG w6e2aE946e+u8ZLbstFzCJoqB41G+8BJ0BF7jhH2gG/5pkq8ISSHBOdBl7i4z5AmzD6p Ih2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=BM3awKY9WdvrYXCeMY3TQpWNLR0nPW3F+msaAwN4Xwg=; fh=KyDKQG2MsL+SdZG4SMDdvGENmEL+dU4wvvJvYlYKmNw=; b=fsAiX/7P4spVYPJT+nopW40CPnnTdTBg1RT//b2TvFCqY01yQsCxbZXiT58iop4Ho0 cAoAw5bYjth3taWr8WZ/qgu2P+d1WvRm7DjLeIv2LHkecbc1qlFRuIG6hs3EsieWqu5b It5F3I6i71qhEDN3aH7z3lfnjqsTTHS3WT+g4o4Z4wYcRxRjUqmjUknZWMRWvV4z2zpA OnZm7rhgbrvnVX6UJQcLHDUVRMGyxUSw9EKC7JEyCoKwUEx3+U+ijpi/btrok8K56GlS hRTu/+hrVOxH1a9+WIg13bii/gOmsHuTnMiQsp80c5RzjaDm5WmGHJNwyI70u3pUmhYJ eVbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=TxCFYRcQ; 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=QUARANTINE 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 m9-20020aa7c2c9000000b0051e3cc20de5si11049856edp.592.2023.07.15.08.41.10; Sat, 15 Jul 2023 08:41:10 -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 header.s=20221208 header.b=TxCFYRcQ; 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=QUARANTINE 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 76FAB68C643; Sat, 15 Jul 2023 18:41:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 327C368C2C7 for ; Sat, 15 Jul 2023 18:41:00 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1b8baa836a5so23340835ad.1 for ; Sat, 15 Jul 2023 08:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689435658; x=1692027658; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bz02kaau6KYuHQUzI+20uMtwlHKer9FUtlZcGk41lZ4=; b=TxCFYRcQhsLC2p6YhUJJt1K0EhMsNTNn/pIBgWZShwEyCfK475r/KxnR/d9CyqDj2P 6GAwm1cSt/ySWMOQORsOeUgg2IeZJJLi49B+bjHmFv/HKJdZAq5HOzyC0VJyiUMCr3Sy cRg1q+9UiAHKuOlbab4QX+J+JNkQGu1kVCbOs69oIYPJpsErqtOJCH0Ay/H+Xbzc4UaP cD0UubwBoC3BY4ZFZnLXVScQYFPcG9IzNjIlIR3ObO0DEyGsn+YzF/f2amcUVhVNkF6j dId9CvvY738oh+vQM5MaD7NPPmih4v4mtnTqkTBmtPFPYqEqRgR7dBiIew2JkRIPxEik OY6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689435658; x=1692027658; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bz02kaau6KYuHQUzI+20uMtwlHKer9FUtlZcGk41lZ4=; b=XYDnpnMIel7JDUz+xgYi3/z9Dk9sssq9pzL+cPIgHPOe0rzchS7C/SFS2kYdQxkZxG d++wPSNU/gTK7Fm9SsxEHfK5472GFMoDrvbghtA8/BErNMQw69U0dqBvtXMt4VhIwtf+ YI7sBperKJjAuU9KMVplYcw1IC4kTVcDO9rUhvS6k6D9Iyl0qAW2XLehVsHHh4eX9ZG3 B8Jxsisg1AYMalMx5FpnslZNuRbHFnWljHS9ca76xz0/iu2Hxr9WcmiiVQdKxLQxdABq Zw6x5m+PSRgzOYsSys/kSSI8ebKR02x7mtTMOpbWdEYaCIr7I7LX9IsEHKVq5MK1IJpM d7xg== X-Gm-Message-State: ABy/qLa60NVNP6oFo+wSJw4TrvUfNa4KNe9tjDohD7AfNLiuQ8Lh4V7y lG0X0Vm4XAiBuhGn8U9I+Yh2b6VDmziKxw== X-Received: by 2002:a17:902:c946:b0:1b8:b2c6:7e8d with SMTP id i6-20020a170902c94600b001b8b2c67e8dmr8100383pla.66.1689435657609; Sat, 15 Jul 2023 08:40:57 -0700 (PDT) Received: from homestead.aragog.com ([2605:a601:a9ae:9100:b62e:99ff:fe37:7032]) by smtp.gmail.com with ESMTPSA id jk16-20020a170903331000b001b9e82a6be7sm9673238plb.220.2023.07.15.08.40.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 08:40:57 -0700 (PDT) From: Pavel Koshevoy To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 09:40:55 -0600 Message-Id: <20230715154055.21035-1-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/audiotoolbox: fix build failure on osx 10.5 (v2) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Pavel Koshevoy Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XOHcb1L/wcw4 --- libavcodec/audiotoolboxdec.c | 2 ++ libavcodec/audiotoolboxenc.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 82babe3d31..e336aade8b 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -71,10 +71,12 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile) return kAudioFormatAMR; case AV_CODEC_ID_EAC3: return kAudioFormatEnhancedAC3; +#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060 case AV_CODEC_ID_GSM_MS: return kAudioFormatMicrosoftGSM; case AV_CODEC_ID_ILBC: return kAudioFormatiLBC; +#endif case AV_CODEC_ID_MP1: return kAudioFormatMPEGLayer1; case AV_CODEC_ID_MP2: diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index 1ccfda4d20..e5217d952d 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -69,15 +69,19 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile) return kAudioFormatMPEG4AAC_HE_V2; case FF_PROFILE_AAC_LD: return kAudioFormatMPEG4AAC_LD; +#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060 case FF_PROFILE_AAC_ELD: return kAudioFormatMPEG4AAC_ELD; +#endif } case AV_CODEC_ID_ADPCM_IMA_QT: return kAudioFormatAppleIMA4; case AV_CODEC_ID_ALAC: return kAudioFormatAppleLossless; +#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060 case AV_CODEC_ID_ILBC: return kAudioFormatiLBC; +#endif case AV_CODEC_ID_PCM_ALAW: return kAudioFormatALaw; case AV_CODEC_ID_PCM_MULAW: