From patchwork Fri Oct 4 09:31:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 52034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp278559vqg; Fri, 4 Oct 2024 02:31:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwyifBhcSj5Mgn+sQliK4YBuDL73huNNp9GmOZrOwgOeNbiHFq3DXZvkvQ+G2XAxyU2e0yXTKF+vhYecgt1Oma@gmail.com X-Google-Smtp-Source: AGHT+IH18MFNyNNidaGR9f+lgiHFK6XhzylJY5FB4lJtrrcjzuQsG23Bth8qFAmE6ig8aFvId0q0 X-Received: by 2002:a05:6512:b0b:b0:536:741a:6bb2 with SMTP id 2adb3069b0e04-539ab8630f4mr331682e87.4.1728034311388; Fri, 04 Oct 2024 02:31:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728034311; cv=none; d=google.com; s=arc-20240605; b=IpIokg+SBTdoGo7rSQhNYb7BGdghUpONQblGJc8KNwDsIvPWm00afYqz3Xh9Ku9bw+ YxLprmEyvIR+w/ahCNWZs1z9HJ6MtJxlvms5y85kixdgZqdnnw08Dfbc4aHqmJwsf8a7 kNUxuOZGVCsKxi9hg0wDIvlQmRXzs/62mRbY9U6LIguH/pzYQivb/yR9k8tFMYDfxmGK Bbb4PIGJZv2JOfXhbIra1fvtQJFiFN6khkbeHNVgaswi8pcwyj3rIpM8TZOGnpFZkzyR pU2pg7SsfpcY7zgivHhgPzfNAGYbM6Sx8AHU3n/Gbfmk5PvhfwnY5Sr5lguSlF70oO4t pb7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=hoHW0iNq9cIYGTITMojk/sxqdBtXUkuuRI2y+913Hjc=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=hMUvqsABZiiqtycB/QvkTlZIpREshbU8iTnzqFxKfku21chAG7pD2oSyeugBpaKrAE iLXIsTulZ+0B2rbgL68iOa3lYe3ImU9rXnbk6RWqhqjX7KdmTW0mkv/o9vYERD3UqByj NtjrAchvVlIxYUMDExuDgYl+ydBTOKsU38XJKjJuyYvT8sBeZAK350tk5uAnD1SEKQhS G+70jtu6diHT1QxY2oioloJRG5OVcxo5PslhnAk8J6foT1/PqigMz3HDqpsjST51AhbS jdtze0hLxifaph071p3xpdsqLreFZmXbjmgNPjubIa+X0jXel4UDueHGsIb5reFpb4oe J0Cg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-539a8286e13si955517e87.256.2024.10.04.02.31.50; Fri, 04 Oct 2024 02:31:51 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E41F68DA3B; Fri, 4 Oct 2024 12:31:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCDF768CD3E for ; Fri, 4 Oct 2024 12:31:39 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Oct 2024 11:31:29 +0200 Message-ID: <20241004093137.139470-2-dev@lynne.ee> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20241004093137.139470-1-dev@lynne.ee> References: <20241004093137.139470-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavc/vulkan: remove redundant header 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: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8mBse+fmI0t8 --- libavcodec/Makefile | 2 +- libavcodec/vulkan.h | 24 ------------------------ libavcodec/vulkan_video.h | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 libavcodec/vulkan.h diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5aed2fff28..a253a9b160 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1290,7 +1290,7 @@ SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h -SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_encode.h vulkan_decode.h +SKIPHEADERS-$(CONFIG_VULKAN) += vulkan_video.h vulkan_encode.h vulkan_decode.h SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h diff --git a/libavcodec/vulkan.h b/libavcodec/vulkan.h deleted file mode 100644 index b15efd4add..0000000000 --- a/libavcodec/vulkan.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_VULKAN_H -#define AVCODEC_VULKAN_H - -#include "libavutil/vulkan.h" - -#endif /* AVCODEC_VULKAN_H */ diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h index c205f7b88f..1ec5f419ed 100644 --- a/libavcodec/vulkan_video.h +++ b/libavcodec/vulkan_video.h @@ -20,7 +20,7 @@ #define AVCODEC_VULKAN_VIDEO_H #include "avcodec.h" -#include "vulkan.h" +#include "libavutil/vulkan.h" #include