From patchwork Mon May 21 22:35:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9044 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp805917jad; Mon, 21 May 2018 15:35:33 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo1cmJuKf57DG0kh07nnaRAh4p4xh70VChxb3T8L7/wzbWzmo75hTZGvA6f0XVFjNMLLOz+ X-Received: by 2002:a1c:c386:: with SMTP id t128-v6mr358245wmf.113.1526942133222; Mon, 21 May 2018 15:35:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526942133; cv=none; d=google.com; s=arc-20160816; b=KV4k85n1Z3b+m0ZTybSWWpkGZVV+IC46lyJRr4GotPEU2i5LPDbOubfyZ/v7xBUEnl fcH8XAUPfe+GEBHc4yywtIc3MvjeW0WACVXvq7ccbfPHxMcmXNRt5Bzrb9vaJ8/rDmJE PloZXwVCMHB2+w+1f4XcKhZjz7CQSneCwOIlvjHNH7dVQX1Klh9FoeR9UMhDJaADqdSa LRlYcmv0M2MRN6jioc9EgGULQ92sdq3iAa/ZQ0QvU+bza8ocIHe795/PlD3VKcdxQRlI H4JIynPDox4upxtW8co4/twc/SdNAJbIUc9+dyARTpOjrdo+G1Mq+frvccqxj02K1zmu uIxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=pGYfAsWbcvLmKFFSMgwh3QX/bW/RbGlerze5DEG6syo=; b=QmZAoaNj0vEls1TBGKMHD6SDOtxYlIieDh/8Xu1wg9co3vmg4JkBTI/Hc/TDwFpD3s 62HiYRE2PSLVgPJcG/d3W39WT4iWnSJ26jm3B/VZ+knujKXxv0VFuwXzaLk45ygHBaUx 8lPgijmlkGCJt//h1yVDocQDHhZK3igDZFO5LxMc64mHNpkxjHOYrjYsVHoEhxW+sK2T iiWjFAQWIvr0c8x51/AfAPTJ7g11B4OMdJ/2paamyrZIwnA/ISAdPMv4rIlhcgkVILUV i+8jxnTXX8i3J/pGufNX3Ap5u4oDgxGEXjOXbolDEH9fah+sgZ5zFKrA6f1Ug+wyojhr W1Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=HC6GIkDr; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i14-v6si7538282wrn.295.2018.05.21.15.35.32; Mon, 21 May 2018 15:35:33 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=HC6GIkDr; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78229689CCB; Tue, 22 May 2018 01:34:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f177.google.com (mail-wr0-f177.google.com [209.85.128.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 461AC680527 for ; Tue, 22 May 2018 01:34:36 +0300 (EEST) Received: by mail-wr0-f177.google.com with SMTP id j1-v6so6531111wrm.1 for ; Mon, 21 May 2018 15:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=U+ByCC5txftPw73ltFSdKoD1SB1Y7q2iPij/dAXs/bM=; b=HC6GIkDrndjNWWqAlqZgaVnVEE5q8pZqnv5ae7FnQ9A0duFP6DaASsse+fwWnZhR5P uoqv36XGtTxXt5dV6uugTeZuynbNLnmUfbTSJ3+IKkvrRc95iZCKXG/SeVP4XTTCgIAW ZKP0T0Vpy5h/ImGoLU3Yto0w3VmFBg8NEwyShBxrLAi7u2tPUQcK9RdxxF3TyFSzNg+V TrxTWCmviZZ4kBMbQP4Yi66Ux46uBE8W4qKMi3xH2wUnoTmsW2tIZ9ICCRupf0QTRW7M e0VkGE2AAU2cEX8cIKkPDWEEC06OBfYR1wIxJpzxLPJXiSv4jFTjhqB8fBtOmbU/okwI OfCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=U+ByCC5txftPw73ltFSdKoD1SB1Y7q2iPij/dAXs/bM=; b=LZ9iZjouc+7rzAbhL14ElCKn9NO0GM5t8FYHnyA644mwoDOBdpBRflxU4bIA4wU0sV jT1caWFI3v08YJhlfBPbxDk2XI9aykEgRgg2+t5xBtDAHqX57+GaCP/bS3EkYQzN3fyK QQsAPtVsio82RZlhrbYZg+qRY4roXJfORr4LtZf8C3LJpfYGhPDiemZyiw5Hr89/BBKZ d+BKn22G4IUDUznAdplwjY9FuTVACh7Jn1VYc2szam6p+/MxKDBOktEPGTz9YzN6PNYj yoOXwPzFIljpIi2duUYMpILU8Qe3/p3oZPs2rHdXSTl1yZd4WY2WYElderThg6WJFqqd K+Og== X-Gm-Message-State: ALKqPwd2RIvtzUEXAS4VQMDbl+3bhZcKzzf9QLJVUHvn/FMdJ5WakSTx 143ghKh3Osp4GO8eiVqxQjlGW17N X-Received: by 2002:adf:e104:: with SMTP id d4-v6mr10115408wri.271.1526942116577; Mon, 21 May 2018 15:35:16 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id e7-v6sm15995209wrn.88.2018.05.21.15.35.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 15:35:15 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 May 2018 23:35:09 +0100 Message-Id: <20180521223511.20395-2-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180521223511.20395-1-sw@jkqxz.net> References: <20180521223511.20395-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 2/4] hwcontext_opencl: Don't try to free an invalid queue in frames_uninit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This can happen if frames_init fails. --- libavutil/hwcontext_opencl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index c29a521f07..0d255e54e7 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -1739,10 +1739,12 @@ 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); + } } }