From 591eb2b527735880442246ccdf554bce494b7676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Wed, 14 Aug 2024 10:30:35 +0200 Subject: [PATCH] vkencoder-private: don't override error on get_format() call If gst_vulkan_video_encoder_get_format() fails it fills the error structure, so it shouldn't be filled again. Part-of: --- .../gst-libs/gst/vulkan/gstvkencoder-private.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkencoder-private.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkencoder-private.c index 9909bdf9b0..f277f4f80b 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkencoder-private.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkencoder-private.c @@ -289,9 +289,9 @@ gst_vulkan_video_encoder_get_format (GstVulkanEncoder * self, } if (n_fmts == 0) { - g_free (fmts); g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED, "Profile doesn't have an output format"); + goto beach; } /* find the best output format */ @@ -776,11 +776,8 @@ gst_vulkan_encoder_start (GstVulkanEncoder * self, gst_vulkan_video_encoder_get_format (self, VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR | VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR, error); - if (pic_format == VK_FORMAT_UNDEFINED) { - g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED, - "No valid picture format found"); + if (pic_format == VK_FORMAT_UNDEFINED) goto failed; - } session_create = (VkVideoSessionCreateInfoKHR) { /* *INDENT-OFF* */