+) Add vulkan patch for segmentation fault error

bytedeco · Apr 24, 2024 · b4ce61d · b4ce61d
1 parent 9a64c8a
commit b4ce61d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/ffmpeg/cppbuild.sh b/ffmpeg/cppbuild.sh
@@ -118,6 +118,7 @@ export PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/
 patch -Np1 -d $LAME < ../../lame.patch
 patch -Np1 -d $OPENSSL < ../../openssl-android.patch
 patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg.patch
+patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../vulkan.patch
 # patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg-flv-support-hevc-opus.patch
 sedinplace 's/bool bEnableavx512/bool bEnableavx512 = false/g' x265-*/source/common/param.h
 sedinplace 's/detect512()/false/g' x265-*/source/common/quant.cpp

diff --git a/ffmpeg/vulkan.patch b/ffmpeg/vulkan.patch
@@ -0,0 +1,14 @@
+diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
+index 67b9526255..e3c0c4c24a 100644
+--- a/libavutil/vulkan.c
++++ b/libavutil/vulkan.c
+@@ -605,6 +605,9 @@ int ff_vk_exec_add_dep_frame(FFVulkanContext *s, FFVkExecContext *e, AVFrame *f,
+     VkImageLayout *layout_dst;
+     uint32_t *queue_family_dst;
+     VkAccessFlagBits *access_dst;
+
++    if (!f || !f->hw_frames_ctx)
++        return 1;
++
+     AVHWFramesContext *hwfc = (AVHWFramesContext *)f->hw_frames_ctx->data;
+     AVVulkanFramesContext *vkfc = hwfc->hwctx;