diff --git a/patches/FFmpeg/FFmpeg/vulkan/01-fix-encode-init-error-code.patch b/patches/FFmpeg/FFmpeg/vulkan/01-fix-encode-init-error-code.patch deleted file mode 100644 index 01afbedf..00000000 --- a/patches/FFmpeg/FFmpeg/vulkan/01-fix-encode-init-error-code.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix vulkan_encode returning success when video encode queue is missing - -When ff_vk_qf_find() fails to find a video encode queue, the error path -returns the stale 'err' variable which is 0 from the previous successful -ff_vk_load_functions() call. This causes avcodec_open2() to report success -despite the encoder being in a broken state, leading to a SIGSEGV when -the caller attempts to encode a frame. - -diff --git a/libavcodec/vulkan_encode.c b/libavcodec/vulkan_encode.c ---- a/libavcodec/vulkan_encode.c -+++ b/libavcodec/vulkan_encode.c -@@ -811,7 +811,7 @@ - if (!ctx->qf_enc) { - av_log(avctx, AV_LOG_ERROR, "Encoding of %s is not supported by this device\n", - avcodec_get_name(avctx->codec_id)); -- return err; -+ return AVERROR(ENOSYS); - } - - /* Load all properties */ diff --git a/patches/FFmpeg/FFmpeg/vulkan/02-fix-encode-feedback-flags-check-order.patch b/patches/FFmpeg/FFmpeg/vulkan/02-fix-encode-feedback-flags-check-order.patch deleted file mode 100644 index bed8c6a9..00000000 --- a/patches/FFmpeg/FFmpeg/vulkan/02-fix-encode-feedback-flags-check-order.patch +++ /dev/null @@ -1,41 +0,0 @@ -Fix encode feedback flags check running before capabilities are queried - -The feedback flags check added in 735c84b57f was placed before -GetPhysicalDeviceVideoCapabilitiesKHR populates enc_caps, so -supportedEncodeFeedbackFlags is always zero and the check always fails. - -Move the check to after the capabilities query where enc_caps is valid. - -diff --git a/libavcodec/vulkan_encode.c b/libavcodec/vulkan_encode.c ---- a/libavcodec/vulkan_encode.c -+++ b/libavcodec/vulkan_encode.c -@@ -773,14 +773,6 @@ - return AVERROR(EINVAL); - } - -- if ((ctx->enc_caps.supportedEncodeFeedbackFlags & feedback_flags) != -- feedback_flags) { -- av_log (avctx, AV_LOG_ERROR, -- "Driver does not support required encode feedback flags " -- "(BUFFER_OFFSET and BYTES_WRITTEN).\n"); -- return AVERROR(ENOTSUP); -- } -- - ctx->base.op = &vulkan_base_encode_ops; - ctx->codec = codec; - -@@ -880,6 +872,14 @@ - return AVERROR_EXTERNAL; - } - -+ if ((ctx->enc_caps.supportedEncodeFeedbackFlags & feedback_flags) != -+ feedback_flags) { -+ av_log (avctx, AV_LOG_ERROR, -+ "Driver does not support required encode feedback flags " -+ "(BUFFER_OFFSET and BYTES_WRITTEN).\n"); -+ return AVERROR(ENOTSUP); -+ } -+ - err = init_rc(avctx, ctx); - if (err < 0) - return err;