summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/ffmpeg/ffmpeg
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2023-02-25 03:10:56 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-26 11:49:00 +0000
commit31756b7d742f4f43fd6804fd67d5ec905d95ebb2 (patch)
treea6f4ed52c5141c9f67214933fb3367399c25854f /meta/recipes-multimedia/ffmpeg/ffmpeg
parente13f4fd22fb0d7bda3974c2bd48837985fb9eb8b (diff)
downloadpoky-31756b7d742f4f43fd6804fd67d5ec905d95ebb2.tar.gz
ffmpeg: fix build failure when vulkan is enabled
The patch fixes the following errors observed when building ffmpeg in vulkan-enabled distros: | src/libavutil/hwcontext_vulkan.c:363:7: error: 'VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME' undeclared here (not in a function); did you mean 'VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME'? | 363 | { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME | src/libavutil/hwcontext_vulkan.c:364:7: error: 'VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME' undeclared here (not in a function); did you mean 'VK_EXT_VIDEO_ENCODE_H265_EXTENSION_NAME'? | 364 | { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | VK_EXT_VIDEO_ENCODE_H265_EXTENSION_NAME (From OE-Core rev: b16c8696be9d56edb5ff77210abfff9a784fad89) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg')
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch
new file mode 100644
index 0000000000..95bd608a27
--- /dev/null
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch
@@ -0,0 +1,34 @@
1From: Lynne <dev@lynne.ee>
2Date: Sun, 25 Dec 2022 00:03:30 +0000 (+0100)
3Subject: hwcontext_vulkan: remove optional encode/decode extensions from the list
4X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690
5
6hwcontext_vulkan: remove optional encode/decode extensions from the list
7
8They're not currently used, so they don't need to be there.
9Vulkan stabilized the decode extensions less than a week ago, and their
10name prefixes were changed from EXT to KHR. It's a bit too soon to be
11depending on it, so rather than bumping, just remove these for now.
12
13Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690]
14---
15
16diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
17index 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 */