| Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 1 | From: Lynne <dev@lynne.ee> |
| 2 | Date: Sun, 25 Dec 2022 00:03:30 +0000 (+0100) |
| 3 | Subject: hwcontext_vulkan: remove optional encode/decode extensions from the list |
| 4 | X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690 |
| 5 | |
| 6 | hwcontext_vulkan: remove optional encode/decode extensions from the list |
| 7 | |
| 8 | They're not currently used, so they don't need to be there. |
| 9 | Vulkan stabilized the decode extensions less than a week ago, and their |
| 10 | name prefixes were changed from EXT to KHR. It's a bit too soon to be |
| 11 | depending on it, so rather than bumping, just remove these for now. |
| 12 | |
| 13 | Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690] |
| 14 | --- |
| 15 | |
| 16 | diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c |
| 17 | index f1db1c7291..2a9b5f4aac 100644 |
| 18 | --- a/libavutil/hwcontext_vulkan.c |
| 19 | +++ b/libavutil/hwcontext_vulkan.c |
| 20 | @@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = { |
| 21 | { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY }, |
| 22 | { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM }, |
| 23 | #endif |
| 24 | - |
| 25 | - /* Video encoding/decoding */ |
| 26 | - { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, |
| 27 | - { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, |
| 28 | - { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, |
| 29 | - { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, |
| 30 | - { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, |
| 31 | - { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, |
| 32 | }; |
| 33 | |
| 34 | /* Converts return values to strings */ |