Message ID | 20180422164751.22628-3-atomnuker@gmail.com |
---|---|
State | Superseded |
Headers | show
Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2914681jad; Sun, 22 Apr 2018 09:55:11 -0700 (PDT) X-Google-Smtp-Source: AIpwx48gzL8gmg4sGB7WRC94EWSuHcHp7whAC+hQdtn8pPNZRwiumn8N8pwQJ6PUDJVRZZwVlSXx X-Received: by 2002:adf:aa94:: with SMTP id h20-v6mr15238073wrc.149.1524416110979; Sun, 22 Apr 2018 09:55:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524416110; cv=none; d=google.com; s=arc-20160816; b=OJWOdw9AUNGNacZA5i8ge6nX6WfLvuNRkZBVkdwuKYlgS535OcfbRAcngWwKwzBE2F yjJWxYYVrhA5zmoRG+G7EAjjzxnq0gSlBIv1ofKrxkw8l/rwgKENKcmvsZhMw0yH2V3N SEo49OzVvEONIdQtrKIlWtSqA2wfiGPXUAVkHvbFaDtfzQVfIwlp8yrKiIQgPEuKhhQU Rkhrt1lzgZJVegGMlLrZfhUEEBCxiJHKTWFTq3/y8STnYTK6ItCRuNpFqVgvwTfXLAi6 VAJkO5AlbGjl69pxwyEBGe8Q1aWWIu9cMNwrAhAIFEDKXzlLoeCmkdWkMiDuwWBCEEoR 2BvQ== 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=iozW+b61mq8rxZZ4r4wmb5wMQKegvcEt+i/WX7TWckXIftC/t+iw4h6cmfD5dpG5aZ dt/pgYuowJqI06jjeyY2S+MhUmKKfzC3tetOwOManD5mR+2xOtvTRwHxylCPzmW+gbpq fPzh+rNl8yEtjEjba06ORC/pmI/p2KGCrWuqKp05awbLufal5sNg68Wf/TCZQQqjG/KS +c2bzFYnMS0uEeT8cNtfhfpwIM6fI6/3y6zy/uFxenE9xfLruJ1A1fKnEqXYiPcKpVHi prqu+6Wx1s+YYRDCBWwb9UbJWtxGlFrZqVgiVSv6KV5qBV8e/cQFDeN9ECwu0Y4QnLJt ALpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Dhx39rrP; 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 129si3006575wmb.180.2018.04.22.09.55.10; Sun, 22 Apr 2018 09:55:10 -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=Dhx39rrP; 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 3875C68A344; Sun, 22 Apr 2018 19:54:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D934B6898F0 for <ffmpeg-devel@ffmpeg.org>; Sun, 22 Apr 2018 19:54:33 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id p18-v6so15734727wrm.1 for <ffmpeg-devel@ffmpeg.org>; Sun, 22 Apr 2018 09:55:02 -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=Dhx39rrP/XPChg0419Y4s8RPxmsN7cRTh2bEPIKWFjh6XyZZMpnk+yIStmF2rXsq2V XfRQ8tXRudkwcCC70D8ZMBaK8+uMZScp/LLYKS8AcYDBGYWobuyfIaTtLyZxmTmoVuCG Hsmcc6zpf+WyTlIJWZa/kAEz67Epzsn/oGaq0oTsDkSFeZggGXAfuz6v7n8HP8XcS5tL fOIe+J8/I7QGISyTs2KXlISCZUlZ7isISjge1PYe8JomKJzr5sfgcZKMRg12PM7+Cbtc eh+pg5JmshuSZY4pOf6B1mZEJQyvOr2qyGBPq+I+bFQG4/k2Eiq4PhyWBPoLubcMn24o j6JA== 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=lC7O8IgjqIvlnAEHBdZjzEABg6qAOEAocsEwDU/htDPaTdEKp4UpdqtRTYG1qTd36K t9xdDqF2yZxWNlhTgyw/3M0RjRJnS6ut4nJQdzEYTebba9HsXMdAumtXY5sWkQH1MtXK zF3olo3yn+VFoRCwHryRlVWV24I+sCjLVsbQeP4m+dcAlJkNxaZus6PF4u+QtNN96j9e mBQoh4kfeawXJASx171VeFVxVBwZr9fijovrwjIu9T622EFG1AVnLqe8OgVy8GCuwJHW NaryXUa4uHlLHpt3g8H0k55uwhezhgy4OFIilvATTdNV/S9OAz35YPIKKZH7DSp6curY WJQA== X-Gm-Message-State: ALQs6tDZIJwMl4Hw7tID2CLRf4CquXn27jLLQMXwpIGK2nsdmO++HJbZ yILZ57xruhZXhs9TX2N6o/riWD6U X-Received: by 2002:adf:c412:: with SMTP id v18-v6mr11948905wrf.20.1524415714113; Sun, 22 Apr 2018 09:48:34 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c88:af00:5419:5e6c:3fec:91ff]) by smtp.gmail.com with ESMTPSA id l41-v6sm18923022wrl.2.2018.04.22.09.48.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 09:48:33 -0700 (PDT) From: Rostislav Pehlivanov <atomnuker@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 17:47:45 +0100 Message-Id: <20180422164751.22628-3-atomnuker@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422164751.22628-1-atomnuker@gmail.com> References: <20180422164751.22628-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <http://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <http://ffmpeg.org/pipermail/ffmpeg-devel/> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <http://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Rostislav Pehlivanov <atomnuker@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> |
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);
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> --- libavutil/hwcontext_opencl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)