From patchwork Mon Jan 1 14:38:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Bohman X-Patchwork-Id: 45445 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp6238923pzh; Mon, 1 Jan 2024 06:38:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IEaLa9WarIInC+CgVCS8Oll+3cM3OxDEI9sklsbzRSi/WBT3jKB/91PJWPYmNlQ05LrYy/v X-Received: by 2002:a50:8741:0:b0:554:f936:12a5 with SMTP id 1-20020a508741000000b00554f93612a5mr6269281edv.64.1704119904176; Mon, 01 Jan 2024 06:38:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704119904; cv=none; d=google.com; s=arc-20160816; b=Ri139v8HRMIpP4/r1N6mUv4IdGbA5ccbnOFbOYUrQajB8G7TWVmC+/+Q2D3NzAnUOJ MmbszI1mT8Ub0y9g1BLjK1IntG8jiNLIDzjX/N4MHsNS/8Viol4V389lLRlE9zaH+RNG C4+ts2fNcD5HLWkSiWG9ChApUjTWU1Cc5Qoh8Fp1Pjne7xUvWCszSotXl2uMUM7m/VF3 PS/A2WcNESEA4J1jlImRC497GbGCLDsmkViuSLYeqqI6eJVIVQMQcO7ELm2gOl0tGPfB Eugj0QBmjrm42nOghZA3HyhmIRbs/JScyOOT4ijxlXKn8tLGYIiVzml1ohmqx4ZPgwDE mEog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=uEnERnouXMYwQNgd30DjIj1bg5eU6fBU3KjiQYdK4js=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=mKh+vRvHwjTYP2oL5Z6NtOq7IcLHZn3PwjigbPT2SdbiUTL2RqqEzfeq9AO6tPZRcE 7WnRt5LYmnV9ZMtoUA+gBZZmt3QWi+8ccjQJSWQpzVlQ3tnDszX7agUhw2XEEv36FEUb 00lMMmYZqzSg+zHGU6IGfAw0sk/1X+KLMHDMNGEuYpeyHirH7CbGXcfHbsu6/ObMoQXZ iAWk1r2USVHTrRf1ZjsTH2cWIsZXZcOldjW1naXY/TxE0iXvIuz1FS73skH+QDNECZ7I AFbV+fG9L/+bkY1K/QEUnqfXk/kWG1xduTHV90SNiQE21U7qWxrXh7FZuvhKWXvMTAJ/ hEVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="K0S/IBUL"; 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 x9-20020a05640226c900b005549a3e97d5si8044862edd.73.2024.01.01.06.38.23; Mon, 01 Jan 2024 06:38:24 -0800 (PST) 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=20230601 header.b="K0S/IBUL"; 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 5E9EE68CED1; Mon, 1 Jan 2024 16:38:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55FDD68CAEC for ; Mon, 1 Jan 2024 16:38:13 +0200 (EET) Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-5e734d6cbe4so67443237b3.3 for ; Mon, 01 Jan 2024 06:38:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704119891; x=1704724691; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=ur4U1Aivre8J3GPmzigBNgpJN4SOJhp5bT0KRBwRUZg=; b=K0S/IBUL+u8tGbDdMdkjm1WRIINRg3yXzzzKPPl0C5g4JYBaXjYTKGo0lmtVlNxNWQ tHW8URYYtaaiOwYG1tDh8OkLhKhsojBIUZ+O7AD+71Sh8cGp0kM/yRH9FPjM2TDpcWFL C0k8EK5cnkJPNZX5Jgz+OHTSbRMOiOvVJWmqrEOaKUaqZw1xSM8SINLH1sveI8pgmdlF WuzeN4WF3ay8q+Nii/0TS3LMbXEBt/FQhfo+RsONJLWGM2S3i4KLouiMxd+8ij+FZqw2 m/6fnL686Yh3dTVOSQwVwjlHcR8Lz+3LLjqzLjc5qos/HsfkKlTilhnjC/PNiQYWS81D 04gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704119891; x=1704724691; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ur4U1Aivre8J3GPmzigBNgpJN4SOJhp5bT0KRBwRUZg=; b=VhWABvR4ZfWoFnEVJ/+7LU5L6Ec1QXHDxvikoItiw58FGEePL8X0HO5En17pXVkSKz z9gIoKAS8j7Y7YuxL2xhj9EbKGN7qvOrjqtmpsitNhHC5WBaAQyeGwAzvqFMDLlb8nko Myyt9GM8VoNu7ymv/pNkkLTkC/c48nEzZyhs3EUh7XgRffH+4LYT5pn0o0UBZtZMlF6Q jO5Q0wgqZoE/DM21Kkz9eLjyhpsiiZotIUIjekdAWYzmNcuicSux5C6elv3KOTRr/EXJ avQUtGBpPOU+xD34Aa5+MLO5CFQnj7FD6eCTjcDwgUCtnWJnFA1xbwZ/ht6voTrfu+YF ZQXg== X-Gm-Message-State: AOJu0YwGDbpt3r9+zAnrAOcXhKqPhZcCvAg47YmDNkk3uMV4BLQvSgVW 6Hb8alOvE61JHFK5mN4iRMENeFAJtJxifH931EkeBPE4 X-Received: by 2002:a81:8ac4:0:b0:5e8:7a0b:2a9c with SMTP id a187-20020a818ac4000000b005e87a0b2a9cmr11671173ywg.89.1704119891450; Mon, 01 Jan 2024 06:38:11 -0800 (PST) MIME-Version: 1.0 From: David Bohman Date: Mon, 1 Jan 2024 06:38:00 -0800 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] libavdevice/avfoundation.m Add missing type AVMediaType for macOS < 10.13. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0kguj8UR19lb This is a build failure in the master branch as a result of commit e37b15e26fbc7bc31a86a4a2c7c798e20d4f4c2c: There is no type AVMediaType prior to macOS 10.13. --- libavdevice/avfoundation.m | 4 ++++ 1 file changed, 4 insertions(+) NSMutableArray *deviceTypes = nil; diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index 6a57163eb7..5fc5cb61c5 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -761,6 +761,10 @@ static int get_audio_config(AVFormatContext *s) return 0; } +#if TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300 +typedef NSString *AVMediaType; +#endif + static NSArray* getDevicesWithMediaType(AVMediaType mediaType) { #if ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500))