From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CFEB245AF5 for ; Fri, 16 Jun 2023 12:10:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 829DE68C09B; Fri, 16 Jun 2023 15:10:22 +0300 (EEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89E8368BE21 for ; Fri, 16 Jun 2023 15:10:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686917420; x=1718453420; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=K9u8t14k09MZrE8fDCME2GWPYoeutI8iEQQZr3c7XAU=; b=HWeXFCkqLSCQkb+AXeImaTC13NOgqIEnLjzvcaYotQAqkxun/ABSmCwy AcaUPjNA+6ktcF8Rnm/clEKHNciOKXxoVepSbHlgQ3UoLKrOGuuHcUHF4 BS4M7TdiHDSE1GMBgc276ABn3N05e1e19yOVAY+OVvbAJUqLmhZtnRfmr fS1RFlQ713FeiAOErBBgJ8j9328jZHDQLkjLowkhm+q3+nKEWmPDS+LdH 8ZCrnfQFKNZrR8BWvo2eJtqMCeF7FdOgERoVSG6AMFXOsdmnk11336z2I MOmDpqz34UOK0gq3qWXsZ1ELuuOXvzDZ3gWqlUGOCTg+sNnulcKXbscMA A==; X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="359209867" X-IronPort-AV: E=Sophos;i="6.00,247,1681196400"; d="scan'208";a="359209867" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2023 05:10:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="742656098" X-IronPort-AV: E=Sophos;i="6.00,247,1681196400"; d="scan'208";a="742656098" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga008.jf.intel.com with ESMTP; 16 Jun 2023 05:10:12 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2023 20:05:56 +0800 Message-ID: <20230616120557.75-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavu/hwcontext_qsv: fix memory leak for d3d11va impl 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: Tong Wu Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Tong Wu --- libavutil/hwcontext_qsv.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 713dc90ffd..931f905a51 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -665,6 +665,7 @@ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl) static int qsv_d3d11_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) { + int ret = AVERROR_UNKNOWN; #if CONFIG_D3D11VA mfxStatus sts; IDXGIAdapter *pDXGIAdapter; @@ -679,7 +680,8 @@ static int qsv_d3d11_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) hr = IDXGIDevice_GetAdapter(pDXGIDevice, &pDXGIAdapter); if (FAILED(hr)) { av_log(ctx, AV_LOG_ERROR, "Error IDXGIDevice_GetAdapter %d\n", hr); - goto fail; + IDXGIDevice_Release(pDXGIDevice); + return ret; } hr = IDXGIAdapter_GetDesc(pDXGIAdapter, &adapterDesc); @@ -689,7 +691,7 @@ static int qsv_d3d11_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) } } else { av_log(ctx, AV_LOG_ERROR, "Error ID3D11Device_QueryInterface %d\n", hr); - goto fail; + return ret; } impl_value.Type = MFX_VARIANT_TYPE_U16; @@ -722,11 +724,13 @@ static int qsv_d3d11_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) goto fail; } - return 0; + ret = 0; fail: + IDXGIDevice_Release(pDXGIDevice); + IDXGIAdapter_Release(pDXGIAdapter); #endif - return AVERROR_UNKNOWN; + return ret; } static int qsv_d3d9_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) -- 2.41.0.windows.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".