[FFmpeg-cvslog] lavu/hwcontext_qsv: fix memory leak for d3d11va impl
Tong Wu
git at videolan.org
Sun Jun 25 07:30:31 EEST 2023
ffmpeg | branch: master | Tong Wu <tong1.wu-at-intel.com at ffmpeg.org> | Mon Jun 19 14:15:08 2023 +0800| [8ea31f694a2a0634872f38aa214a4a6cd678120c] | committer: Haihao Xiang
lavu/hwcontext_qsv: fix memory leak for d3d11va impl
Signed-off-by: Tong Wu <tong1.wu at intel.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ea31f694a2a0634872f38aa214a4a6cd678120c
---
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 b1759a93e1..bcf07f064c 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:
+ IDXGIAdapter_Release(pDXGIAdapter);
+ IDXGIDevice_Release(pDXGIDevice);
#endif
- return AVERROR_UNKNOWN;
+ return ret;
}
static int qsv_d3d9_update_config(void *ctx, mfxHDL handle, mfxConfig cfg)
More information about the ffmpeg-cvslog
mailing list