From patchwork Tue Jul 11 14:10:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 42594 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp1470246pzb; Tue, 11 Jul 2023 07:10:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlFs/YsgcJJEXC/DreB4+66AEelswLTTCcu/R08F29ZQL4izyzTBuctIOrYpfJfbv2+5AYe+ X-Received: by 2002:a2e:8748:0:b0:2b6:c2e4:a57a with SMTP id q8-20020a2e8748000000b002b6c2e4a57amr15446891ljj.38.1689084656315; Tue, 11 Jul 2023 07:10:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689084656; cv=none; d=google.com; s=arc-20160816; b=rBy4YY92rFcMBIozvjAG8DKT+n0JBW7lXioiyuFrs8qFS5lYCsRjq/UB0IInCPT82E j6P6B60NTX2/lJ32eLzgGDPEW9xuJrKesg+HdFkclzh9Hv2bpjNFGDIJQ+HZhfzQZuVR K8o8u2AJKY1O2hnvkJDybEz3mV47rahmu7TvVEjKxFdvkkYNpSHjBmctwiMo/8FhNtAP zJU064K57sX2v2N1Mg++RkLliq8lvecsUjUlXWbQQsxOFiwTm8LDHtl6M+dTGwgfEs5p 5V/GU2oA+MU+AC/Vq7XyUt4bIdpk+NUAOIUb4KkSf6CWLdShTbOKbOwa09Bg9HFv6A+J tFFQ== 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=y5ZwBmEa7t/Ka1Dk6MqBcv2Z6tccHksPzcpr2n/edBc=; fh=KyDKQG2MsL+SdZG4SMDdvGENmEL+dU4wvvJvYlYKmNw=; b=CQHf6ySXRRk1DSTj4ugq26XBjehcfX3G0lR6daGdqVGu9Y3VI9IK4m/QOUfuZmBleO 6QGZJ1HLJiC9ZV1MJ7BpU2HztBGyesBZeGl6Ct8HxJ4hlPvXTtdTDaeyNuV+bn2ZiNiq CnvKICz5AUJ2nV0s8cwes8R7FnWckIvA/H5NdkPG+o5PDdMZfMQikyRL1cnvZUglYZh4 T5qcATyOucpWY+xE1jGc3Ntn+P+xo4uIW0o17VieXQRzVzk26LBr3wYURA7iikhMF5bQ qiABdzBl9JlbvOFKJdrutIKeZfAeTcyEZM0KvGUATrPQINliahKb+UFDF1Djmfj15+uV u4Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=bFq8PXAc; 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 u16-20020a17090626d000b00992d6f93de2si2053559ejc.961.2023.07.11.07.10.54; Tue, 11 Jul 2023 07:10:56 -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=bFq8PXAc; 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 99DC868C4E8; Tue, 11 Jul 2023 17:10:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15E3468C3B6 for ; Tue, 11 Jul 2023 17:10:44 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-66872d4a141so3845227b3a.1 for ; Tue, 11 Jul 2023 07:10:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689084642; x=1691676642; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=qQrGOhWnuDdq11eR5kFHECewXBmRlziVOTHo1EDl4pI=; b=bFq8PXAc+E5fKGmJ6ljuI20dWq+127CO+bLprHb0/YyF/Wkv7Mh2MARbrNwmZbq38Z sHTYoeNs2Xx7ux8LCfJ5ZPD9klrx3yhrZroguzBYo7jsTRFm8fZnoTs51L3tlon07377 9iE5/kiXIzfJ8vIqo8RcdGJwOOG/awuY+5Gj5IyAxm20U4qJYXr8+MTqHkmzxEcI/Dab e72WGsDusUMs8X1kHlaFvFDr80nnDL6sOBIx9bf1kpl4VcphlaiHXn/mtkGUUEZnikhv KUMl/8QrEvGTgQi/swynb003VV80GU4TFE/QTYc6yRgzB2CkXDXwbKpT6lWBn/PAQLQQ pD7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689084642; x=1691676642; 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=qQrGOhWnuDdq11eR5kFHECewXBmRlziVOTHo1EDl4pI=; b=kRxUrN/fX86kuIuJSnozvvCW/udhWTYnsdOk1/6TGQIYj2AXfyFOAcBtkpOvC/DI8V kbS+KBj5WxS+HvXnd1YvtUw3xnun1t/veAAghPEpaktVaNJEvJqKQD1Evt7Q22D7UVqT T3BtTXRUI7t/nRqKIJDRUADkIZRZe5yGFNkgwOlZ4m1dtlrLZUgBz6Vc40HAnQTI5nbZ WZ5mzP9GU1HQUt5vy8E+6FdH8ht7Y4MvCnSWjqICOXTQujCJ+V9LSdhDR0JtaUvxEx1m hyKA2zPDZl24QC11lanWYJ04nHZe5Emb8tgIMHPWvRKO65/gx+cass5BC43I3286kHl4 eDRg== X-Gm-Message-State: ABy/qLYDxv0U5JSiyFC8C2QAvdly+LL3TDz5osSr8nooI3tMwlbeFVmA cxr1YHttl2MJPObUhT/cpp7klFeBP4nCpQ== X-Received: by 2002:a05:6a20:938b:b0:12e:4ccb:32a1 with SMTP id x11-20020a056a20938b00b0012e4ccb32a1mr15603843pzh.26.1689084641537; Tue, 11 Jul 2023 07:10:41 -0700 (PDT) Received: from homestead.aragog.com ([2605:a601:a9ae:9100:b62e:99ff:fe37:7032]) by smtp.gmail.com with ESMTPSA id r6-20020a62e406000000b006828a3c259fsm1748849pfh.104.2023.07.11.07.10.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 07:10:40 -0700 (PDT) From: Pavel Koshevoy To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jul 2023 08:10:39 -0600 Message-Id: <20230711141039.20303-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 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: 8sROJJDr7SnD --- 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..7b33cdf87d 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__ > 1058 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..f652836018 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__ > 1058 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__ > 1058 case AV_CODEC_ID_ILBC: return kAudioFormatiLBC; +#endif case AV_CODEC_ID_PCM_ALAW: return kAudioFormatALaw; case AV_CODEC_ID_PCM_MULAW: