From b9aff7a53d598a7882bfe3db449a3e5dc6543f05 Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Sun, 25 Nov 2018 19:14:27 +0000 Subject: hwcontext_opencl: Only release command queue if it exists If the frames context creation fails then the command queue reference need not exist when uninit is called. --- libavutil/hwcontext_opencl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'libavutil') diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 728877553f..be71c8323e 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -1726,10 +1726,13 @@ static void opencl_frames_uninit(AVHWFramesContext *hwfc) av_freep(&priv->mapped_frames); #endif - cle = clReleaseCommandQueue(priv->command_queue); - if (cle != CL_SUCCESS) { - av_log(hwfc, AV_LOG_ERROR, "Failed to release frame " - "command queue: %d.\n", cle); + if (priv->command_queue) { + cle = clReleaseCommandQueue(priv->command_queue); + if (cle != CL_SUCCESS) { + av_log(hwfc, AV_LOG_ERROR, "Failed to release frame " + "command queue: %d.\n", cle); + } + priv->command_queue = NULL; } } -- cgit v1.2.3