From patchwork Wed Dec 22 00:07:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32815 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5920650iog; Tue, 21 Dec 2021 16:14:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxy+iWUxE4IxHFrTxMOJ6kj6OyaoP0zg93S7yySe9mg66ZQ9sei3Go/qdlkZNwoqcTS3v9g X-Received: by 2002:a05:6402:90d:: with SMTP id g13mr619525edz.156.1640132055522; Tue, 21 Dec 2021 16:14:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640132055; cv=none; d=google.com; s=arc-20160816; b=WMsf7Ni4Oe6IXlK4ARtjkzK+aMQ40oAV7x6hUT/IOXDPfhwrUCmmVwW96cQLok3/E5 rGbkz6QlWTFw4/onxcbxzBmjIWO3yOVbyZGainB4LI7BvuU1xIQLsY0umdVo8fmn5L3k NRIJJJEKmdGIUESUm3vL8chlvJLXNbTAAe+Mk0i6n6AZYXmhMq43Vb7OKrUxjpTTAnVP bz9CqmaYUcQS6BLCbtmDkt/JBc/1SOgQgSnY1iJfK1mj6hFTaLLI9h3e2bXzPyR0a1Sk 6wtJlzJuzdO/i30585dSM+azfu09plZV4yAorBCNHeYIR39n0Gp9EyPeDBsH43PX9Ue/ FvVw== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=p02irp+cgBG2uhXwCdPCzOMce2yeovMSyGK0n3BEM+8=; b=Pv4P62Kf0hKlrFzyVgGmv8ZP4swPDTLizZrlfcipBg7DZOCaV2mGlHcAY1NNSnoNmf lAtb2San9lHnwcc4Gq8/ei2JIYc0AGp+ohwTpaXN2rz4SgzIvunMXyxyH3eMNMP3Navw h2+hMK1ON2tGPN/8UBPlxZKUHWjLOtXRvxY2mHMJYwEUhH0ojfzNGNECBRvtud/sgjPI Z0SnX0XNGrLeYo8RDhyJ/oA3T4/IE5+Md4Z3e8mXSTrAJAD/NVOPNQg5/Cx6tZUSXRkV SybAdkAERbDFNtc+0PzDP3LJb6uRbtWRKssjoGN8FKpW/EGhBLyQd1b7TXpf/QipNerr VpeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=QYbM6884; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cs10si174055ejc.434.2021.12.21.16.14.15; Tue, 21 Dec 2021 16:14:15 -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=@rcombs.me header.s=google header.b=QYbM6884; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 571A068A538; Wed, 22 Dec 2021 02:14:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFE7C68AE3E for ; Wed, 22 Dec 2021 02:14:05 +0200 (EET) Received: by mail-pg1-f180.google.com with SMTP id 200so491788pgg.3 for ; Tue, 21 Dec 2021 16:14:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0bwKKfuDVf7mo1s2m+kBt1oOiiU4zry6KDXY14Bkzh8=; b=QYbM68845iU2g6upkYW1WH0PR5xFKD7Dr6YvzpxSmYEAmOtK8CY8BTVTtZpikZde4l IEaoeoV9y3WzPTuKlq/0U6IBO7ay23lWjUPI3egPZxSKWHpCXT3QXYv26bv7yktzhMZ2 yv2OaR/2JGNa9Ca4N/xAUTIoOguvuS4s5ggZQUJWROjzQ4woVJGDsJ9T0UkteKdfQeDO S3IXsK0lZr0rFsHj4pVVS3j4Ql3/EWPll+4V3B+hJe8gB4ZV05qVx0B3FEkcHgbMEZXH vcpcgnMsYwcoKK9AmpvTFuLAHYsSKpHOPua9wIeBH9vUHjVb5YCZ6xfJg4eaIf/GK3Zj zbIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0bwKKfuDVf7mo1s2m+kBt1oOiiU4zry6KDXY14Bkzh8=; b=IsxGOr4ttkfz/8t/xu/x2Irm7NPMI5ES/AWUCDKCih/psqVF4RQBNeTbEQ73bvPBwp DDkzSR+jFffuAXtR55A3og+TpOZlLZPQU1CvRAcUFRplzzqGz9NgEgdJv+kut0e6I1qI 3LlU1rZ5YB5aERxH2g05ZgjDGY95+RW/QDKk33mSfg9fvKw9dEoR4Tzr4/T7u9kDrcRT lmgjlhWbgynOI0ihiEwBgKec3iM0D65xjWpJ16iwKWJB8KEtjDGB3L5zbEkShxq9fVJa LG3hw97Wod2r3J9ZK/Efu6b5U8CZjabiPZFaguxhjv9qYWyBkGlcGYybgCPMYcZUvK1u 8bPA== X-Gm-Message-State: AOAM533RirkcA4kLrG7gymYBNkAGhWrfM5106umSOHRZyppTNhhnARwq oAgLMjEHuy/SjL1ZzHCu+pnifLdmnnKV534= X-Received: by 2002:a05:6e02:20ee:: with SMTP id q14mr303925ilv.44.1640131654164; Tue, 21 Dec 2021 16:07:34 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:d068:8cb9:95e2:de39]) by smtp.gmail.com with ESMTPSA id a1sm238240ilj.35.2021.12.21.16.07.33 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Dec 2021 16:07:33 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 18:07:21 -0600 Message-Id: <20211222000725.38266-3-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211222000725.38266-1-rcombs@rcombs.me> References: <20211222000725.38266-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/7] lavfi/metal: don't use braced-include for internal headers 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: KmpbDjBVv41K --- libavfilter/metal/utils.m | 2 +- libavfilter/vf_yadif_videotoolbox.m | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/metal/utils.m b/libavfilter/metal/utils.m index 759ebedfba..f831502065 100644 --- a/libavfilter/metal/utils.m +++ b/libavfilter/metal/utils.m @@ -17,7 +17,7 @@ */ #include "libavutil/log.h" -#include +#include "utils.h" void ff_metal_compute_encoder_dispatch(id device, id pipeline, diff --git a/libavfilter/vf_yadif_videotoolbox.m b/libavfilter/vf_yadif_videotoolbox.m index af83a73e89..65f155982e 100644 --- a/libavfilter/vf_yadif_videotoolbox.m +++ b/libavfilter/vf_yadif_videotoolbox.m @@ -20,11 +20,11 @@ */ #include "internal.h" +#include "metal/utils.h" #include "yadif.h" -#include -#include -#include -#include +#include "libavutil/avassert.h" +#include "libavutil/hwcontext.h" +#include "libavutil/objc.h" extern char ff_vf_yadif_videotoolbox_metallib_data[]; extern unsigned int ff_vf_yadif_videotoolbox_metallib_len;