diff options
| author | Philip Langdale <philipl@overt.org> | 2022-10-29 18:47:37 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@overt.org> | 2022-10-29 18:49:46 -0700 |
| commit | 48bb17549c55eadf862953ad7c79c9a1b334673c (patch) | |
| tree | ecbece2210d8647b3486683736674187e4b0ad06 | |
| parent | f5944824513f3081ac01484c85960324bdaabda1 (diff) | |
| download | mpv-48bb17549c55eadf862953ad7c79c9a1b334673c.tar.bz2 mpv-48bb17549c55eadf862953ad7c79c9a1b334673c.tar.xz | |
filters/f_hwtransfer: remove VAAPI <-> Vulkan mapping for now
This mapping isn't actually relevant until we have the Vulkan interop
merged, and it requires a newer version of libavutil than our minimum
requirement. So I'm going to remove it from master and put it in the
interop PR.
Fixes #10813
| -rw-r--r-- | filters/f_hwtransfer.c | 4 | ||||
| -rw-r--r-- | video/fmt-conversion.c | 1 | ||||
| -rw-r--r-- | video/img_format.h | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/filters/f_hwtransfer.c b/filters/f_hwtransfer.c index 83847b656a..050b674db8 100644 --- a/filters/f_hwtransfer.c +++ b/filters/f_hwtransfer.c @@ -51,10 +51,6 @@ struct hwmap_pairs { // convert between the formats, so we need a lookup table. static const struct hwmap_pairs hwmap_pairs[] = { { - .first_fmt = IMGFMT_VAAPI, - .second_fmt = IMGFMT_VULKAN, - }, - { .first_fmt = IMGFMT_DRMPRIME, .second_fmt = IMGFMT_VAAPI, }, diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index d200a5db31..5194221d50 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -67,7 +67,6 @@ static const struct { {IMGFMT_CUDA, AV_PIX_FMT_CUDA}, {IMGFMT_P010, AV_PIX_FMT_P010}, {IMGFMT_DRMPRIME, AV_PIX_FMT_DRM_PRIME}, - {IMGFMT_VULKAN, AV_PIX_FMT_VULKAN}, {0, AV_PIX_FMT_NONE} }; diff --git a/video/img_format.h b/video/img_format.h index f493267f97..79358031f6 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -318,7 +318,6 @@ enum mp_imgfmt { IMGFMT_VDPAU_OUTPUT, // VdpOutputSurface IMGFMT_VAAPI, IMGFMT_VIDEOTOOLBOX, // CVPixelBufferRef - IMGFMT_VULKAN, // VKImage IMGFMT_DRMPRIME, // AVDRMFrameDescriptor // Generic pass-through of AV_PIX_FMT_*. Used for formats which don't have |