From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9532446386 for ; Sat, 15 Jul 2023 16:11:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC82A68C492; Sat, 15 Jul 2023 19:11:45 +0300 (EEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EED3D68C1B8 for ; Sat, 15 Jul 2023 19:11:38 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3142a9ff6d8so3107173f8f.3 for ; Sat, 15 Jul 2023 09:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689437498; x=1692029498; h=mime-version:references:in-reply-to:message-id:date:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=TCU/JvEJciIgbst+8eh8Gm5/ic0FmtXgJO/4yC+EHUo=; b=Ok0A1GsEKfl83gR/5LHteEWHp4m1aRo2xjTHDpqWaR7X1JVFbZbgQw0EUBdgElwt2j ohrLnHxgPCDOxhZNUnsLz/unIVj59Z67ZiHABAPEIIaPqFABlzu6AzdnCODTyDA4v6+3 RMvmxfTS5FgOpf9DIZbMo0x81G4XfEB58f3PEwAO9vQNnYe+dfMjoH5M1hBE+zQpQmqr r4yldFDXVIecbpRc/0yCL7F5Dm+TYQHfWO8vhiPO+taWXnRvDDF5qKKOzRRi08W+AauS AY3PO6L9y7mg9z88QJH9bgG0Ccdp+8vaiiPYO0LGRtaH+ojR3HcoPgciOfejr0D+DKyB L/IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689437498; x=1692029498; h=mime-version:references:in-reply-to:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TCU/JvEJciIgbst+8eh8Gm5/ic0FmtXgJO/4yC+EHUo=; b=I7BbSwhu3Tq9lC8sTtddg8C0Hl5Vmo+sYd9vgbxg5dClLJgs08/Ce4eaL2jDTImm6D lJwzjQDKpAsiHJLmKGITxd6mMcqxMTbslqicDjPeDDQ0oJC5vxhoFvL6GitFXqjuYzGM r8TG86yAdZp8XMmAU/5i2hNeWvpENjUiRpAlmv/hBnMJk8v/YSZ2IgtJ0mTQ7PezcxXf usF7SowG7wvvRuHw81eRH4LQRCraNF1kFAVuWFX5347V3gxAiUa4kgxgLel9vZ4f14qs kKTfjKUiMo8XILwzhe/M4NKA7MejP0MBp5HxhaGA036il2kmal+7U6nKz49tA31KbUrX pJgA== X-Gm-Message-State: ABy/qLb6S7Kzw0Ofy8mD9YifdBUM1NhP6ODtIQuf+8EmT1LgElTUF5Ax aGkGPfQ55vX7z4a2F42dhziH6QtIe20B+Q== X-Google-Smtp-Source: APBJJlGQm1P2FNqrBwBFmtZxO4fXh0YVwKXGwlmKCGKsXaKkOMf3CSYMYvoObBqu1ONUPOE1TDERVg== X-Received: by 2002:adf:f589:0:b0:314:3994:cd98 with SMTP id f9-20020adff589000000b003143994cd98mr7218365wro.62.1689437498019; Sat, 15 Jul 2023 09:11:38 -0700 (PDT) Received: from [192.168.1.202] (adsl-dyn93.78-98-186.t-com.sk. [78.98.186.93]) by smtp.gmail.com with ESMTPSA id w22-20020aa7da56000000b0051e1a4454b2sm7204552eds.67.2023.07.15.09.11.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jul 2023 09:11:37 -0700 (PDT) From: Marvin Scholz To: FFmpeg development discussions and patches Date: Sat, 15 Jul 2023 18:11:36 +0200 X-Mailer: MailMate (1.14r5964) Message-ID: In-Reply-To: <20230715154055.21035-1-pkoshevoy@gmail.com> References: <20230715154055.21035-1-pkoshevoy@gmail.com> MIME-Version: 1.0 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 15 Jul 2023, at 17:40, Pavel Koshevoy wrote: > --- > libavcodec/audiotoolboxdec.c | 2 ++ > libavcodec/audiotoolboxenc.c | 4 ++++ > 2 files changed, 6 insertions(+) > Hi, thanks for the patch, small remark below: > 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 I think you should use __MAC_OS_X_VERSION_MIN_REQUIRED, as the __ENVIRONMENT_* is an implementation detail and not documented IIRC. (Same below) > 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: > -- > 2.35.3 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".