Message ID | 20180522024616.3091-3-atomnuker@gmail.com |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp987196jad; Mon, 21 May 2018 19:53:40 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrfSOtIgN6C/sslN4YKwLjm8NpJSECubp8+wXLr9BROHE3Ik7XtpXaZAEi4CaXdJ1FNBtFm X-Received: by 2002:adf:b2a7:: with SMTP id g36-v6mr18029700wrd.130.1526957620112; Mon, 21 May 2018 19:53:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526957620; cv=none; d=google.com; s=arc-20160816; b=fK52aXcoPGaCwKyypu5pNKPze7nHk29xIHOLdmla2rPyyz15auE8EHXY1olFsMC5lC tIm1i/qGrJFfsvaaB5ykIuM1zJEG75HNVsgB2TZgk4q908vijjEarlkmu2mv2T6sdnMA 3YKdLbNvaQIURDat++1h267iFYhEmnrUKyK9thiJQMTYtywoSABBqjxgOmlZAFe5Umt1 PI5GgDGNjTvXLSavHTKClJELSETDWjTRZBsmrOhKpoFixePvRurv+cF710aCo4ybt0mC 1CygRj2FSTO4/a3YMhoKLFtj4XfFQ62EOiK7JJtgOSpcFQX07uocLzn+monETgifEru5 bV6A== 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=dF+HU7pmJZTgd/EScJ+WpynaW9s3WGrEMKKQUviS2gDWRbk85wXHzTj8DWVQZIKf+4 HvU9eGXXF2fcpt6HCalUrLPksgLJYc79vvIcRTOv6RHXHJQnRHbNwqnFf19tCjjEqdXE dqfJoYNR63CuaJCa3tBmi1Nyu6g8wx2M21CrOyOSTIA5HYzHyUSiL0y+pNULVBgJqvhz OldynfOhjhEWVFuhh5q8DeE2G00MuRgMzFerr46zqnMIfKelZN9f5o/4Vp0H0brdPfUP UdVQg6hAXIEpzSeaJUB78W8g+kOHlNvcMp3FSDQ75SXqwBaIqPmeZikK4wdf70D2NRE9 6ARQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NeFlrkKI; 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 j187-v6si10792155wma.15.2018.05.21.19.53.39; Mon, 21 May 2018 19:53:40 -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=NeFlrkKI; 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 6D0A4689E1D; Tue, 22 May 2018 05:52:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2259F680C92 for <ffmpeg-devel@ffmpeg.org>; Tue, 22 May 2018 05:52:51 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id w194-v6so28259941wmf.2 for <ffmpeg-devel@ffmpeg.org>; Mon, 21 May 2018 19:53:32 -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=NeFlrkKIAyd3lh0p/2fVFxnqgy32wbNjZKXybvE0E38UMhRdWhzaLXH2ZCpC8rfnQw p8P2QONe68nge649o2mQU1IC6KFokeJkZwbLIS2K+HleB9rhW7YmzSCgVmp70b3+Bm3E nlJdByzuD0uaNpdvJMJHGoWxagyrV/3/mkR9hiXy1BYEvB8vuyAFA76zd/Su3/aR3VyE x3ri7RMUUr8x6pNUQ9PT1KEXkF84JVvz+EGcfmbXAouIxIYOQkacRhslH5L6Yvxqbryc XOSjcWg96DPLPWcjfnDS034siHNzdPEgA+CAHMISVVuHev2Gbjl/gJ8j37lSzx/MH+Jo urWA== 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=iElmb6kV8YN1P4bRa0ZTBrJcT2OX1JJN0Wwl1MyUkxXcEVWNod+KU5aN9xbmL0GubA l7Kc4LJ55xVQ0zHb9fzodel6QyK9bHZPSOZtoQMgSIbtBrh1+AaawS1xfvEhy+Ke8o4I FNE5TtMkpO5xmBCVgwKs08emIYDwbmsE29NtRiFM/agSl95IwbZLNaIUKLCeabwi/Z6o Oo5ViVir7hR/9SXbxLgxPPgUhDfO5afJGoAH7vs7iQrJLZGjIm3Mbz/hyJgW27Yugtem 6tszRIYjSWyEuGRt7S17qRV08+TLKQu3ctR3IK+EQDIzwIZFQiOOtuAQ/NZUhXIXhb5k C1Qw== X-Gm-Message-State: ALKqPwctaD0zCVfdVx98PM7FAM8zW1PEwgSqYMzoacj/JwcslcQPFI07 rlnv5xRj/8gPjy4OkRWgBWEHWYku X-Received: by 2002:a1c:71dc:: with SMTP id d89-v6mr686639wmi.26.1526957301884; Mon, 21 May 2018 19:48:21 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c8c:8e00:150:af35:e548:96e6]) by smtp.gmail.com with ESMTPSA id k5-v6sm7736085wrd.13.2018.05.21.19.48.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 19:48:21 -0700 (PDT) From: Rostislav Pehlivanov <atomnuker@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 May 2018 03:46:10 +0100 Message-Id: <20180522024616.3091-3-atomnuker@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522024616.3091-1-atomnuker@gmail.com> References: <20180522024616.3091-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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(-)