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 /filters | |
| 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 'filters')
| -rw-r--r-- | filters/f_auto_filters.c | 2 | ||||
| -rw-r--r-- | filters/f_hwtransfer.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/filters/f_auto_filters.c b/filters/f_auto_filters.c index f6d068ada6..43791ed13a 100644 --- a/filters/f_auto_filters.c +++ b/filters/f_auto_filters.c @@ -85,12 +85,10 @@ static void deint_process(struct mp_filter *f) char *args[] = {"mode", "send_field", NULL}; p->sub.filter = mp_create_user_filter(f, MP_OUTPUT_CHAIN_VIDEO, "bwdif_cuda", args); -#if HAVE_VULKAN_INTEROP } else if (img->imgfmt == IMGFMT_VULKAN) { char *args[] = {"mode", "send_field", NULL}; p->sub.filter = mp_create_user_filter(f, MP_OUTPUT_CHAIN_VIDEO, "bwdif_vulkan", args); -#endif } else if (img->imgfmt == IMGFMT_VAAPI) { char *args[] = {"deint", "motion-adaptive", "interlaced-only", "yes", NULL}; diff --git a/filters/f_hwtransfer.c b/filters/f_hwtransfer.c index 26b1daaedc..10655b6411 100644 --- a/filters/f_hwtransfer.c +++ b/filters/f_hwtransfer.c @@ -56,12 +56,10 @@ struct hwmap_pairs { // We cannot discover which pairs of hardware formats need to use hwmap to // convert between the formats, so we need a lookup table. static const struct hwmap_pairs hwmap_pairs[] = { -#if HAVE_VULKAN_INTEROP { .first_fmt = IMGFMT_VAAPI, .second_fmt = IMGFMT_VULKAN, }, -#endif { .first_fmt = IMGFMT_DRMPRIME, .second_fmt = IMGFMT_VAAPI, |