From patchwork Sun Sep 10 20:53:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5093 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2361856jaa; Sun, 10 Sep 2017 14:01:44 -0700 (PDT) X-Received: by 10.223.176.13 with SMTP id f13mr6390217wra.220.1505077304419; Sun, 10 Sep 2017 14:01:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505077304; cv=none; d=google.com; s=arc-20160816; b=dQF1FKy3UauiERMgFJuSRVjNYqk5dsY/lCS/1IwIoftxp5eegtX1nQcmdE3i0stCDG 21yMSHR8NZBj0SqkSzAap9AICaNxjlo3JyV8QDndnyKC2J3d4AjczXwugkGcMg9QGBSS bNctwg3XLjZdETvRtPnewWspI3b8NJeeT2XSHlFektuKmn14HqljpssoBdoOVLvNUazi q+c13/mPSbtStV9gaEhfRtSqVIPxjaGbC8LMq4QchqaeksAHf1dc9bxhxaBAisufm8Ws ii9aqcVS2wq10jR6iZ0nGOoed+PUUMwlcAED4mzLrHeswUvlVLGUe7Vo5AdEKBSQ8o5v xFng== 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=XG9OZFscyUd+aKBNWd6p/SgCL3zD6PKMIGCe/Vs+ZFA=; b=IZ6qbzWSPDEMl5l7oVU9JDPHyrgRMvuPiqhxEAArWQtVvV/mZkoQ8dzMHBVQeu6GmM tKPDlr/26vf8AjgWrxFIlMQV2VqC7TX9z06QWMWaMMx5VZUXL5kAUiMO81FdgKpcZnnY FFV7/1PamOyCoLTCLtgJa+5iURju0GzRvrzAtmnwI6jloEmQu1RYNmcmB/ZmrtSUISf7 yv4nKC8YgfZMEly5nAYOHE6Dz/wAd/6KfByLFTZNwYe3M++G97JCU5AESpHGwl8FR6EI SW5a9d3d7PudbiPaope7WnlA6WviYuuNVGta1YWx7IcUjhJYo05XM8VnQJB3thsu897+ lutA== 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=iSoeMc7O; 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 w18si5679432wra.243.2017.09.10.14.01.43; Sun, 10 Sep 2017 14:01:44 -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=iSoeMc7O; 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 2A9B0689D55; Mon, 11 Sep 2017 00:01:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A03D96882C7 for ; Mon, 11 Sep 2017 00:01:32 +0300 (EEST) Received: by mail-wm0-f51.google.com with SMTP id f199so27750612wme.0 for ; Sun, 10 Sep 2017 14:01:37 -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=BMH7SfD9NJG1bkTOzRNvFFPgQagXRrpJl0H5yLIpPKw=; b=iSoeMc7Oeuq3uFf4HW72DKxdw4CvesPKHSvPR/NW9pX+ZcUmoG4LtYkDVI6rXyDH72 Fhkg1/YtqkFMak8RXxLitXnsUJla7lUEoCneWNqj1U4jKvImFxcT6MghojpVJbfSkSA3 qehl7kQNCTaSm28V4ouBtAPXwh1LEj8xjoRTT3bDZecZNrHt87OYJkZK7dkOels6D4WW Od1zKfUHt4B519/fGsFiuSasMan8DNFQJF8XfmEvXyECk1F3YXbaoYOERD7T7dQaWWKs WahVJbz6XgJOMj34aUQFx/QlFvUuDDjX7Frv0eWx9AeHeAvWg1PryM5RznDpXD3A4B0O vOfA== 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=BMH7SfD9NJG1bkTOzRNvFFPgQagXRrpJl0H5yLIpPKw=; b=Bu9BUQ3FaJu+H3emJGudqEFbCEW6i3dc7PVO1OwPbJEBrcP/YLSVhVpnqoQNSJ1OA/ CISed07fkVphzN5tOe8TciztUrQUS5mISOarR/A47SyTNNH1X6HwgL/sDSjQB1zpnPIE R3zhRV2necYvon3e2VHyBELxdUG3NkU9NfzRnulRrfdtMOwX2UR+mH1pjNk+xqkhTaa9 zwzvwwe892tP/Xu5AYHicM6dk4LW9940V9qwGtnG5OEZF2CZa84Ub9QUfdgYAebSEkhn ARnPhOp2HcSFHTRzAqMSr3tbyGXJcwIfIYaRWZtdYfqdBS6pmfZmnlskzZ1eV73WUKbs wpwA== X-Gm-Message-State: AHPjjUj5U0v0RFSQAwh+1pkZ8MDaI2YfWA2d2kGY8GXPebSrJFZr2D0J eSu6YP8Ase+WV/ye50Tc0DCAHn9H X-Google-Smtp-Source: AOwi7QCdQBU+q7liV8hoDDd6F4PYg9U6G+X6Vc0uV8bvxokunLU88c8aSu4rGAN6iJiXOD48Cn7e5w== X-Received: by 10.28.57.215 with SMTP id g206mr6872514wma.117.1505076840678; Sun, 10 Sep 2017 13:54:00 -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 z51sm8742868wrz.80.2017.09.10.13.53.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Sep 2017 13:53:59 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2017 21:53:38 +0100 Message-Id: <20170910205338.29687-15-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170910205338.29687-1-sw@jkqxz.net> References: <20170910205338.29687-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 14/14] hwcontext: Perform usual uninitialisation on derived frames contexts 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" --- libavutil/hwcontext.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 77cf68fe2e..4d0b2a1998 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -216,19 +216,16 @@ static void hwframe_ctx_free(void *opaque, uint8_t *data) { AVHWFramesContext *ctx = (AVHWFramesContext*)data; - if (ctx->internal->source_frames) { - av_buffer_unref(&ctx->internal->source_frames); + if (ctx->internal->pool_internal) + av_buffer_pool_uninit(&ctx->internal->pool_internal); - } else { - if (ctx->internal->pool_internal) - av_buffer_pool_uninit(&ctx->internal->pool_internal); + if (ctx->internal->hw_type->frames_uninit) + ctx->internal->hw_type->frames_uninit(ctx); - if (ctx->internal->hw_type->frames_uninit) - ctx->internal->hw_type->frames_uninit(ctx); + if (ctx->free) + ctx->free(ctx); - if (ctx->free) - ctx->free(ctx); - } + av_buffer_unref(&ctx->internal->source_frames); av_buffer_unref(&ctx->device_ref);