From patchwork Fri Apr 20 04:30:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 8526 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp232824jad; Thu, 19 Apr 2018 21:37:44 -0700 (PDT) X-Google-Smtp-Source: AIpwx49yu7i3ADOhjkN1dHhHUrmyJx8jLBV40RPrbwYpRRGzRctkfjk0lOkY1zGmBQLHVbW0JV9J X-Received: by 2002:adf:e14e:: with SMTP id f14-v6mr6013682wri.56.1524199064478; Thu, 19 Apr 2018 21:37:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524199064; cv=none; d=google.com; s=arc-20160816; b=GzPxbJvuN5uh1HY/Urj5I6wrAljmMe6wQgmE2mnJlfYnT/gPTCRgZnP+FR6J5EGYcQ zoQ6DpL0j4T8A1eEF2VDBy1eZOOO9xYBHF3Wxf79dsB12Dxz2r0QSoNgemzwCHpb7x9g dkYdXOIXXKBKXy3xAf8pt4YTEKbUcFASpz/JJRehEPgi30tq7xNxoL8Lp+P0WuDHqZwf AoNLbr9XFhrCYT+wVMw6fEISI9dhxh4C1TGn0optOm+ojFw6rLOvFVcs1V7UCxZAyCf7 Iolqh0DhgVih1rwGZ56JpR5/72ZcBoG5wzANkUXmfe5KTQwOI6XIKxzVv3yQ7EJOPxbd CsHg== 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:cc: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=m9g1CTkMWC4tVxY1EY4hazFQUmzDYu5lJ7zmb8/vPeM=; b=x2iSuvyeHifEgKiAjDNV36/Tdk9zaXMfVp+i2nzOT2ygGjIPfbYQKbPemykDB+u4/V ZUl8WZVCZ/3t2FjEGdchyuDHD1HpZ17H840BkUDAgKhZgLN4haRKUqiPnfM+mMEwBz4r PFOCXUArm2tx72jNOaNj40uRZxQZOhRGri5048JosyEj5j1ER3Kn3lxgyyYJ2z5z/6Vn pJ0dDUmrvm8EJf1+ZkTOn7qX6EYrOPR6chHpFOQ0kQnJjcS4WjOScp/5GZzyd3QcUm1m eNfsyhYwXQ0sBDsG5d6hT8bYMiI61k5ojw+/Ai9V8wkTe4u45OvwBxOi+/kMXUQ7IOeR 4amw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TLwG/18r; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l75-v6si4205666wrc.237.2018.04.19.21.37.43; Thu, 19 Apr 2018 21:37: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=@gmail.com header.s=20161025 header.b=TLwG/18r; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68FC868A1CE; Fri, 20 Apr 2018 07:37:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2565168A183 for ; Fri, 20 Apr 2018 07:37:08 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id v24-v6so19293873wra.8 for ; Thu, 19 Apr 2018 21:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rkEzxDoenUV2a0HSAl/smMgX+QYdLM38GlcR36M797w=; b=TLwG/18rEgHfTbJ4VqWjhXE93fusm+dXI2/NfYcxmDorvx12rfTdbhuZNLxalc0pyo DKnNZtlH2DXXJS6N72T4anjxfwa8vavEowk2tf5WoPyWEiRgZu9MW4/G3ZTee24B1Ma2 t0F5A2UJxkKV9PPtw8GyhzZBhxtXtmpZJjh3UYzRTt0KB+lPEsRPL9IKsyR899wAztVp 1paEueoJzgDMnblgGClx0XZLrO93eJDMzNShS1NZJtOFP1FQ9sz7p7X3iXeZ9GXan/eM 1DgiJa84KFw6UEPa+HmGLf4+I3utC7UKQiXuAFafA8F/RY8Aj7tKZRrF9ZtByDvnXIww Kfqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rkEzxDoenUV2a0HSAl/smMgX+QYdLM38GlcR36M797w=; b=fSu2l7aNpG6QKCO2pc1sQ2ZESVu64Y1hI2j5UtmW19upYd1BbZuble2tP87fWhx2Jh pJEc+7hfEJA8HE6CCjx8R7IcLdgJAS57ET6zssbdeOubvD6gJ/PrwMYxktwG272w+dVH tEEG6+EONpk1syTg8PWF4oE1Hi6dq6HKRM3YVk7TgHyHgTxlmFYurmtZsEzzAWphyU5r bkWtRFvpiwelWj6aulK/DsOcjiB/KVEEu3uUfQ6OtdUQVSRXrUvkSpe5fjGZJmpoee3L mKYXyfpsHKLJqmAcTDhBzLy+DyHAMHlXFo+bd5q8KFJ+O8wp3pfpGyKGoDtqVHZYGkes kNcg== X-Gm-Message-State: ALQs6tBUtqjM+NR73fsCzA2buXRLse7+mwPx4i/oSrObukvdYt8TKoWl 12ADiqD7I31o28jZrxyhPM6xDj2u X-Received: by 10.28.89.68 with SMTP id n65mr681938wmb.96.1524198644897; Thu, 19 Apr 2018 21:30:44 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c88:af00:4c9e:9728:c86:66cf]) by smtp.gmail.com with ESMTPSA id 80sm935304wml.44.2018.04.19.21.30.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 21:30:43 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Apr 2018 05:30:04 +0100 Message-Id: <20180420043010.3709-3-atomnuker@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420043010.3709-1-atomnuker@gmail.com> References: <20180420043010.3709-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/8] hwcontext_opencl: use ff_hwframe_map_replace() 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Rostislav Pehlivanov --- libavutil/hwcontext_opencl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 43b5c5ae0c..1d18da37bf 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -2171,10 +2171,7 @@ static int opencl_map_from_vaapi(AVHWFramesContext *dst_fc, if (err < 0) goto fail; - // Adjust the map descriptor so that unmap works correctly. - hwmap = (HWMapDescriptor*)dst->buf[0]->data; - av_frame_unref(hwmap->source); - err = av_frame_ref(hwmap->source, src); + err = ff_hwframe_map_replace(dst, src); fail: av_frame_free(&tmp);