summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch34
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb1
2 files changed, 35 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 */
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb
index 63abc5d437..cccd9f65ab 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb
@@ -25,6 +25,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
25SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ 25SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
26 file://0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch \ 26 file://0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch \
27 file://0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch \ 27 file://0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch \
28 file://ffmpeg-fix-vulkan.patch \
28 " 29 "
29 30
30SRC_URI[sha256sum] = "619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc" 31SRC_URI[sha256sum] = "619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc"