Remove the avisynth patch (fixed upstream by avisynthplus)
The 'Cache::~Cache()' symbol conflict between avisynthplus and vmaf was fixed upstream by avisynthplus. References ---------- [1] https://gitlab.archlinux.org/archlinux/packaging/packages/ffmpeg/-/issues/19 [2] https://github.com/AviSynth/AviSynthPlus/commit/d1a32d5229602f181574c95fa0db68bcf1762606 [3] https://github.com/AviSynth/AviSynthPlus/pull/452
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
--- a/libavutil/vulkan.c
|
||||
+++ b/libavutil/vulkan.c
|
||||
@@ -671,6 +671,9 @@ int ff_vk_exec_add_dep_frame(FFVulkanContext *s, FFVkExecContext *e, AVFrame *f,
|
||||
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;
|
||||
AVVkFrame *vkf = (AVVkFrame *)f->data[0];
|
||||
Reference in New Issue
Block a user