History

lavc/vulkan: remove redundant header

Lynne committed 2 years ago

Commit fcd1cdc1 parent 4c881863 files · +2 −26Browse files

Showing the changes to libavcodec (3 of 3 files). Show all

Unified · Split

3 files
  1. libavcodec/Makefile +1 −1
  2. libavcodec/vulkan.h +0 −24
  3. libavcodec/vulkan_video.h +1 −1
libavcodec/Makefile+1−1
@@ -1291,7 +1291,7 @@ SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h · 1290 unmodified lines
12911291 SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
12921292 SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h
12931293 SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h
1294−SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_encode.h vulkan_decode.h
1294+SKIPHEADERS-$(CONFIG_VULKAN) += vulkan_video.h vulkan_encode.h vulkan_decode.h
12951295 SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
12961296 SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h
12971297
libavcodec/vulkan.h+0−24
@@ -1,24 +0,0 @@
1−/*
2− * This file is part of FFmpeg.
3− *
4− * FFmpeg is free software; you can redistribute it and/or
5− * modify it under the terms of the GNU Lesser General Public
6− * License as published by the Free Software Foundation; either
7− * version 2.1 of the License, or (at your option) any later version.
8− *
9− * FFmpeg is distributed in the hope that it will be useful,
10− * but WITHOUT ANY WARRANTY; without even the implied warranty of
11− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12− * Lesser General Public License for more details.
13− *
14− * You should have received a copy of the GNU Lesser General Public
15− * License along with FFmpeg; if not, write to the Free Software
16− * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17− */
18−
19−#ifndef AVCODEC_VULKAN_H
20−#define AVCODEC_VULKAN_H
21−
22−#include "libavutil/vulkan.h"
23−
24−#endif /* AVCODEC_VULKAN_H */
libavcodec/vulkan_video.h+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #define AVCODEC_VULKAN_VIDEO_H
2121
2222 #include "avcodec.h"
23−#include "vulkan.h"
23+#include "libavutil/vulkan.h"
2424
2525 #include <vk_video/vulkan_video_codecs_common.h>
2626

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t