From patchwork Tue Nov 23 09:01:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 31555 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp8354415iob; Tue, 23 Nov 2021 01:06:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3xjLMZpI3vrw0bLbV2hE/so8abSB6MZsZzgo9GAiaTmOW6Dew74G7MSnbDYAiQ4ZVBPK/ X-Received: by 2002:a17:907:7f9e:: with SMTP id qk30mr5547986ejc.238.1637658392432; Tue, 23 Nov 2021 01:06:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637658392; cv=none; d=google.com; s=arc-20160816; b=W27uwBndCgTr6xePZnxffSChzzYzupb9clXa5zv3CscRq1JROpUnUyvsV5QEIImehI 98/NXzgeEOEKskDRuULKVBHLSm2Il7ZjZxMTofpBYpfZ7mrjupuAo4HGGCrg9t8KXhS4 McBLmkgD3GlvglKHD/X4NmwTLk5KVOk6iSQWq2m+np6GFRfX5Cvjc4+iS7Ql1vgR0wNE kt3Bwy+kMU2ahTU/KMhnE3F0MWt7ZQZbdnuV7hVtq3vRQ3fvD3NfuRJ8v9Cq0681UcYK xXMQbzR/ukI8NvfOyC/CRsrcwRnqHPcQdqREbWBX8zcI2ZNQChq+5Zd1FgkQ1Z+T1fee N2lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=5ijkrQn0AO5jHIcsPCDYnSRdfPgiP/5oo3b+/VPDNiE=; b=RRWA8/VppTu0iD6JY+xJ/IMsSotUB52i0CdfcLInQAxqF1P0YAfgIqo1jbQ1hWzj0m re8KAF1AgPqcW2E4lR9yI7bnQH/s+2yTPDGzbjn+57E13jtTVQrrivDL4TrTA9XOZVnG XmJfgqgTj1U1dYPRXYyK4sU8fnEW7X7udjmRTysb34aF7Qf+X680G596qS6ubOLYl02t uVhOwIvGI70Pb0WxpDX6UaXeth9en3qo+XW9FG39ZIAahFxKQUiLXr00a2ZQqAd8i+Z1 NHoKqMYdq8Wzpl+QuhhyKAaYi8Szu2Qi5XEO1dOtBkVJneAwNRTqjsdQg4BVATtFSng4 yRLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u9si32916659edp.507.2021.11.23.01.06.31; Tue, 23 Nov 2021 01:06:32 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3227D68AEA2; Tue, 23 Nov 2021 11:06:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB5C568AE8C for ; Tue, 23 Nov 2021 11:06:01 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10176"; a="221866476" X-IronPort-AV: E=Sophos;i="5.87,257,1631602800"; d="scan'208";a="221866476" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2021 01:05:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,257,1631602800"; d="scan'208";a="509337709" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga008.jf.intel.com with ESMTP; 23 Nov 2021 01:05:47 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Nov 2021 17:01:18 +0800 Message-Id: <20211123090119.868788-3-jianhua.wu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123090119.868788-1-jianhua.wu@intel.com> References: <20211123090119.868788-1-jianhua.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avutil/hwcontext_vulkan: check if created before destroying the instance X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Wu Jianhua Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GkHu1m/tiX17 Signed-off-by: Wu Jianhua --- libavutil/hwcontext_vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 4ac1058181..644ed947f8 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1157,7 +1157,8 @@ static void vulkan_device_free(AVHWDeviceContext *ctx) vk->DestroyDebugUtilsMessengerEXT(hwctx->inst, p->debug_ctx, hwctx->alloc); - vk->DestroyInstance(hwctx->inst, hwctx->alloc); + if (hwctx->inst) + vk->DestroyInstance(hwctx->inst, hwctx->alloc); if (p->libvulkan) dlclose(p->libvulkan);