From patchwork Sat Jul 15 19:36:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 42746 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4483404pzb; Sat, 15 Jul 2023 12:36:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlEPvtNNvn1gIKwTrPGFq2NvLFBSWJo2KJbzEbQNWokdISPMrNG+5jaen/X49Q3AbWJxjBKp X-Received: by 2002:a17:907:c84:b0:96f:1f79:c0a6 with SMTP id gi4-20020a1709070c8400b0096f1f79c0a6mr6654640ejc.70.1689449779270; Sat, 15 Jul 2023 12:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689449779; cv=none; d=google.com; s=arc-20160816; b=ErA2nFU4asj/7JwafChfNhosBU9FYXMAT/7aSCPSsP8jxSp68I0XTbbUvwg97BiVif QKhS08E6NVd4U4VQUgP+nu5NbHywASoAdoi1Yvm8oG7mnWUikgauF/Kf5vH9Rk8VfTdf tQbAaXDDXNbU9YrUcLjogkVyUKVax9QI5ZukAj6u4JVM05Ycm2WbVObyjkLMIwA86Z3M Qn62bf9h1CIwAbAG3JrJ+bQiAKX6lK2Fk8vziUFiQ1rdoQ+4P4DYYZpZLS7fN+nrQWrR uA/2sb7QYR3B2aOb0qrC/dVeGZMJuyKYACtJ3OW3paPG01U0nzlFd8Ez8dlnwQ8LQl0L 2ZnQ== 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=KVYU64GhJoEx14SbBytVDeckZmveT7hpmMGTAIrDfpw=; fh=KyDKQG2MsL+SdZG4SMDdvGENmEL+dU4wvvJvYlYKmNw=; b=ck4slHVi0Wz4te0O+5m1m7C5f1w0/ZF9fJvGxJ6RYpXl4rTOxiNtEGu2xUVLy2OdyM /vCq3YWOlIh2/jW6Z8SNcNXX+VsWTGXGnP688zFZnFmijl+qt4hSYzLwSRQQHa7Oxw8S wJzdXqhrxt0lfTwtsdf9D5GkFUdBa59CyvsFpRZHirE2qn9c5fLsHDby833PHtOfp+Rk 7aX7edd/yl8Tqm+L/6STcMKHLJZPoScgwdR/tPzrZ5lxUyBoJElKF8bizpm4NIQmNg2f njTJeNISi2QxAvpf15tD41PCpHJKlyxRu2hYVZD1iepH9Wa5PSiC8OKm5SLBOocD2mij U9GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=rZHeTRP5; 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 k8-20020a1709062a4800b00997124ebc83si1472673eje.6.2023.07.15.12.36.18; Sat, 15 Jul 2023 12:36:19 -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=rZHeTRP5; 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 D4A3368C5E0; Sat, 15 Jul 2023 22:36:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DE4C68C44A for ; Sat, 15 Jul 2023 22:36:08 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-676f16e0bc4so2082200b3a.0 for ; Sat, 15 Jul 2023 12:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689449765; x=1692041765; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jcVl6WTePvLie+yfPiQy0oFbBvq66gTGHl3AzOmYkgo=; b=rZHeTRP559sxUHdQ/K0+l0NwnLl1oGS6g2TDlZApkpQUay4WY45P0feL/le9Mq5Mg1 A0j8oSf4qusV5TNq309CrX99FTXT0Kg4mKE2hmttE+v52lWrYC5CFoBb05pbHgUk109b pQJLZ109jAn6PctFaaqVsp+bZLAeKjpnAmUa9+/BkWWORPO0mZWEWBKVIaDiL8DOcZjv C4LtuxaqAROWhbrzD3Q+C1eYsxZJybyAI9nMg0aQEe7SCQ2QwYjTvEzW3ylp7xiSVaSL dv+Alwwv14aFKIbAtEJwt+YwkfHwqueULqSl+IW4vQskgJCnIk2LwEhS5eX0GJ7xEs7x JSuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689449765; x=1692041765; 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=jcVl6WTePvLie+yfPiQy0oFbBvq66gTGHl3AzOmYkgo=; b=MEumuULAPUR+b9xcltiHFnQJGUkqwCJVEnH9SSxt5lrcYAzrKVGcZ/r18TnuhxgGgY Zco6c89NwqJ8aJ0xn9crieg79gZv1nGEflNlr53DFLXb5lgYjgUt8DE+Msu5mJ+1mhyp 83zOzN1z7+iVY5bfnA68ZPK1TJBMoJvIh2PIJFJVJ6JyZLdPAUZOu1VCNyhp1VzhbsbA zbKVH1BRM4Qio5+h3H8MuFL/MWLqltbx/nQovDbGatKEtm/+oknlLrmNkeUenaup81cw OIPdjNDQSpOgHGD4m0bHEucfPB7lAGlevY+fdJzn8rfW58L9GNdUwMuD1Dm8P9CaVpGq qA6Q== X-Gm-Message-State: ABy/qLY1HuUCNXiR2C0U3z41lozKivRqGvvgGE8nCnP46wc73eZjUvll XAGD5hROUzdsmhGKJRqYCiHkRWnfWUBRaQ== X-Received: by 2002:a17:902:e744:b0:1b8:5ab2:49a4 with SMTP id p4-20020a170902e74400b001b85ab249a4mr8534865plf.53.1689449765503; Sat, 15 Jul 2023 12:36:05 -0700 (PDT) Received: from homestead.aragog.com ([2605:a601:a9ae:9100:b62e:99ff:fe37:7032]) by smtp.gmail.com with ESMTPSA id t2-20020a1709028c8200b001b9cf522c07sm9801702plo.57.2023.07.15.12.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 12:36:04 -0700 (PDT) From: Pavel Koshevoy To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 13:36:03 -0600 Message-Id: <20230715193603.22215-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 (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 Cc: Pavel Koshevoy Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vDqr8iszj4+N --- 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: