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 BA12149CB9 for ; Fri, 8 Mar 2024 08:25:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17A1268C498; Fri, 8 Mar 2024 10:25:25 +0200 (EET) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB00A68ABD7 for ; Fri, 8 Mar 2024 10:25:17 +0200 (EET) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-513298d6859so1693460e87.3 for ; Fri, 08 Mar 2024 00:25:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1709886316; x=1710491116; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=KJ4jRpOOSb5N4Rm+46K90IYxQebMDvdopDuoAdrW7+c=; b=sfyjq3y6KkDBUXQ22QdqCXEtEsehm9E4W/wFWZvEu2EbwtjbwlwZiucNr3QaLLljBc RPntd4r/7uL86G5TBGOLqcL0J5f6tNSGnz4ym6VCa6Pt06CjCHmNVU1ZQbDjIxP5D1Ac ybeLeQKr1d7JWW0VBV2G6b6jCJCMdY7jyPlqLTVdTBpy8jwBbxSMwbDBOALn5DXAmd1k YIfatG1nFyHMhn/ViLZBqwtUKIvagAtQLEAyarvqQtL3KDqnZDeSyG18rIuqgrl0rquV MPrqdn9ynTwuxm6tBCG8g0wvwYxxr+0lSxRzDvX2O/raXlhm5SiSzU4NtZXzwk8i1fue 7r3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709886316; x=1710491116; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KJ4jRpOOSb5N4Rm+46K90IYxQebMDvdopDuoAdrW7+c=; b=KZEwSE80VQLotWVh1CT8XQkDaq37r5UsH4acvhdNxNWR8qUMJ34i3Ij4/JWO7OIyyW qi3mDBbEA/cGGau2hhtqfG3mhGxoyy/aSNtTR8cjjBOaisbK8n0R4Wuc1T0PW87WCYci aTAWeqHNnilv8m+GstbJMZ0R72jqlyu43d51hxS8Hv3KAiqc16tbpWxmDGPkJ/CHj9+F XfnvIUhDtDrE4X22ppALQUToszN48T4XWMv6kW9BJRoV3bGat5pz8jefXubfWy92ko73 0m7kr8itsp4QOzOafLkMqfBsH/kiNe/GxfFT5tKonfy5K+ar6XzO5kKA9t8k3qKwzth+ Ykyg== X-Gm-Message-State: AOJu0YzkskvflEL3QzBZMKsFncTQTpqSiC8Mkn5UmFfYQWVVpGAv8XQ/ bHc1oQo6MFl9eocmfqPEsXPRzU59HPIHGWCEimF05TVvKtV+agkhvZiuop+g54fwHTUvKz6E7hp vkYYM X-Google-Smtp-Source: AGHT+IGmMdAa6N1rnJ8ZXMMAZ7nwwifFhnbZElkPMONWllTqcKF5epp1w3gGMzBCuA/R4ZD4blJ4Yg== X-Received: by 2002:ac2:5e35:0:b0:513:1c6e:583e with SMTP id o21-20020ac25e35000000b005131c6e583emr2789855lfg.61.1709886316281; Fri, 08 Mar 2024 00:25:16 -0800 (PST) Received: from localhost (host-114-191.parnet.fi. [77.234.114.191]) by smtp.gmail.com with ESMTPSA id f21-20020a19ae15000000b0051320115f06sm3359601lfc.236.2024.03.08.00.25.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Mar 2024 00:25:15 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 10:25:14 +0200 Message-Id: <20240308082515.53722-1-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavdevice: Fix the avfoundation device after switching to FFInputFormat 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: This was missed in b800327f4c7233d09baca958121722a04c2035ff. --- libavdevice/avfoundation.m | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index a0ef87edff..d9b17ccdae 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -32,6 +32,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "libavutil/avstring.h" +#include "libavformat/demux.h" #include "libavformat/internal.h" #include "libavutil/internal.h" #include "libavutil/parseutils.h" @@ -1292,13 +1293,13 @@ static int avf_close(AVFormatContext *s) .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; -const AVInputFormat ff_avfoundation_demuxer = { - .name = "avfoundation", - .long_name = NULL_IF_CONFIG_SMALL("AVFoundation input device"), +const FFInputFormat ff_avfoundation_demuxer = { + .p.name = "avfoundation", + .p.long_name = NULL_IF_CONFIG_SMALL("AVFoundation input device"), + .p.flags = AVFMT_NOFILE, + .p.priv_class = &avf_class, .priv_data_size = sizeof(AVFContext), .read_header = avf_read_header, .read_packet = avf_read_packet, .read_close = avf_close, - .flags = AVFMT_NOFILE, - .priv_class = &avf_class, }; -- 2.39.3 (Apple Git-145) _______________________________________________ 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".