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 3255146E9E for ; Sat, 15 Jul 2023 22:58:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA20668C5B1; Sun, 16 Jul 2023 01:58:34 +0300 (EEST) Received: from mail-oa1-f46.google.com (mail-oa1-f46.google.com [209.85.160.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A90568BE03 for ; Sun, 16 Jul 2023 01:58:28 +0300 (EEST) Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-1b03ec2015fso2315074fac.3 for ; Sat, 15 Jul 2023 15:58:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689461906; x=1692053906; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=Pl5YbvSaaI1p4KsJ3hkUwikqqkNwec8jL2LNrB0o1t8=; b=F/cqC4zidCYcwUVTkBk5T4OE7LAOtdpsYkxQx/BtxdsAWTUrrRaqvg7WIKFrnczbN7 1oiB7XWjgwTOS9Lv/Qaz6JOd/1nsTLgiWq7PMX2l895o9ZEO5XZvpNYAl7rPhKplp1w7 8U4JXppFluerg5LyT77BVFjTCq/TB6wGuRMhNqUUxfeOqc104jgq/5IcNp8Q3Vv+wfj/ tmDsdAF0fdGMcTC391QjYTnb5FTjTgzRbfTHVJPd2pGD+PFsrbVlb1zXcEM3PoV0syaj aGT7/tBsRw/8bxLtmJ7z02gGOvy57z4EUpi60I6NXDmMiArTyEbWp8cTIlw61L41JE12 jcmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689461906; x=1692053906; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Pl5YbvSaaI1p4KsJ3hkUwikqqkNwec8jL2LNrB0o1t8=; b=MYVsgDR2SuUbUt3KBsSOJXintP5+cYl4MJ4/davlxDgeMAurTujUvw2VgHEaHNq+kn 4SelCL66MSeXIqhzydnI20eRPCrHTyJN40FX3ExCSSC5x6PIk49dDDXWNuFU8ChycoKf tgP6DHtfsU33FoGUywlPERBj7VJXOPJaEBAaAIDj32OlQR7h03R9dgfdYQK0YrXNC0hK dkLAojb8ITj7sdGyjxN7lFe7lxrLV3yLlpHg1Ns9JRlEcikIOwoxZMhR3OBdMuPRrBwz gJW3pSmRXikRyvcU+gd/TH6UbkYQobSSXDC28M607wTUEtTQFW/oGxoBkzoNtGKUNuuQ vICA== X-Gm-Message-State: ABy/qLZo+P+gKxK2mRqEbFAsoLcfHV6mv2EU2E3+IeWxe6g/5xcwcJ1y 1T/jRbgXhI4iSuXv8h/e4fMqQFGbUgg= X-Google-Smtp-Source: APBJJlGzFIqa813XnloEiRHKYKeMdvvm5YzRFBnqlSNefcHG4tNwnoZzgXQmqoOV62VIh8uDeeUo2Q== X-Received: by 2002:a05:6870:944e:b0:1b4:4931:d579 with SMTP id e14-20020a056870944e00b001b44931d579mr10218199oal.8.1689461905568; Sat, 15 Jul 2023 15:58:25 -0700 (PDT) Received: from [192.168.0.16] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id w21-20020a056870431500b001b10207f1edsm5446144oah.48.2023.07.15.15.58.24 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Jul 2023 15:58:25 -0700 (PDT) Message-ID: Date: Sat, 15 Jul 2023 19:58:31 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 To: ffmpeg-devel@ffmpeg.org References: <20230715193603.22215-1-pkoshevoy@gmail.com> <08860546-3228-4E6F-833D-787B47EE94CD@gmail.com> Content-Language: en-US From: James Almer In-Reply-To: <08860546-3228-4E6F-833D-787B47EE94CD@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] lavc/audiotoolbox: fix build failure on osx 10.5 (v3) 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 7/15/2023 4:54 PM, Marvin Scholz wrote: > > > On 15 Jul 2023, at 21:36, Pavel Koshevoy wrote: > >> --- >> 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..5456f916cf 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 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..46aca4c7ff 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 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 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 > > Thanks, LGTM from my side though I can not push it > as I have no commit access, so someone else has to > do that. Applied. _______________________________________________ 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".