diff options
| author | sfan5 <sfan5@live.de> | 2024-02-24 12:35:51 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2024-02-26 17:37:20 +0100 |
| commit | 861e9566f67d31ecc11b204dde094fc693a9f981 (patch) | |
| tree | 4a737eb2110f1bec546a84bf59a96749171f1426 /video | |
| parent | 09f6f28cc2fc39a2407ab2f32c192f6152360fb6 (diff) | |
| download | mpv-861e9566f67d31ecc11b204dde094fc693a9f981.tar.bz2 mpv-861e9566f67d31ecc11b204dde094fc693a9f981.tar.xz | |
video: don't define IMGFMT_VULKAN conditionally
We generally try to avoid that due to the #ifdef mess.
The equivalent format is defined in ffmpeg 4.4 while our interop code
requires a higher version, but that doesn't cause any problems.
Diffstat (limited to 'video')
| -rw-r--r-- | video/fmt-conversion.c | 2 | ||||
| -rw-r--r-- | video/img_format.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index aa7d857341..39dead4600 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -66,9 +66,7 @@ static const struct { {IMGFMT_CUDA, AV_PIX_FMT_CUDA}, {IMGFMT_P010, AV_PIX_FMT_P010}, {IMGFMT_DRMPRIME, AV_PIX_FMT_DRM_PRIME}, -#if HAVE_VULKAN_INTEROP {IMGFMT_VULKAN, AV_PIX_FMT_VULKAN}, -#endif {0, AV_PIX_FMT_NONE} }; diff --git a/video/img_format.h b/video/img_format.h index e342de65da..975f58ad39 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -313,9 +313,7 @@ enum mp_imgfmt { IMGFMT_VDPAU_OUTPUT, // VdpOutputSurface IMGFMT_VAAPI, IMGFMT_VIDEOTOOLBOX, // CVPixelBufferRef -#if HAVE_VULKAN_INTEROP IMGFMT_VULKAN, // VKImage -#endif IMGFMT_DRMPRIME, // AVDRMFrameDescriptor // Generic pass-through of AV_PIX_FMT_*. Used for formats which don't have |