From patchwork Tue Mar 21 22:43:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 3050 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp47489vsy; Tue, 21 Mar 2017 15:44:39 -0700 (PDT) X-Received: by 10.223.131.134 with SMTP id 6mr36520089wre.27.1490136278983; Tue, 21 Mar 2017 15:44:38 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b5si2173357wma.108.2017.03.21.15.44.38; Tue, 21 Mar 2017 15:44:38 -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; 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 D684D68836F; Wed, 22 Mar 2017 00:43:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04559688302 for ; Wed, 22 Mar 2017 00:43:48 +0200 (EET) Received: by mail-wm0-f48.google.com with SMTP id 196so5180307wmm.1 for ; Tue, 21 Mar 2017 15:44:06 -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=egGVQ1zHP/6tFaJv9a3TiquueF9XV1rUK4bAoFDHuoc=; b=NeWiL9y+dZONKe3VBGNkorwnQx/4xgh7rnAUsgGS3F8iovq8ZEowt+hjFIx9KmJOEq kk6EEGl+r8AJrpkjwTadXTIpAre9CzdiPXbiFdv0EKyM3xKwCUkuBad2sLW+q5O4AJ4I r2z45/G73yJuCcPw6Rxl1yglRgaX/tDCDXfbaNI6QNM8qsXIzkXHsXn7yczqnT8z4JY1 Ew51ocadO5pqCHsimND6Cghnnsp3W50KInGtTjb4zBp3aDtv8hKn1FOxToCI5W649e4y 886O9E5mGYPbRTVTbjoJwWmya/Cs3+neHslD/QcIUrWhOK5n0EkK4UTTCqqQe3SQqx3H orCw== 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=egGVQ1zHP/6tFaJv9a3TiquueF9XV1rUK4bAoFDHuoc=; b=J/nVXP+g4k2PstR2ii6RF5BAqI3Un8KTBzAzGqvil4txmnA6T327p5lBq+R3UXJ/p6 q2y6ae8Djt58bGxmmxEheduVBkw7hczC6/NJIz79vE6xYiaP6MFCS1DXSDnLEnKYG5tM icfyj/okAijGEW7wFo4gNPAfs88yemehaLn45lkOFfwiEXgKYmsdN3A6e3uRw5XS+n9d 4S1M7Wz1CWlgNBO21kmK1gtxUdvdQAl+jxpri5yKHM065Ig/OfajRFo6nUsI1+DGF4UQ xziW4IonchCEcibk36A6fWaSQrXsasH4JxHVawj2es0P85x+VnXYhJ23K5wKjlm3G3jZ IsqQ== X-Gm-Message-State: AFeK/H3bCKrIHAtUIJNpmGR6fMSDnhqtqtYPksgQLqly73DHfr80KPjUh0AqCv7/AOmAQQ== X-Received: by 10.28.93.142 with SMTP id r136mr4912549wmb.95.1490136246083; Tue, 21 Mar 2017 15:44:06 -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 c35sm26585493wra.1.2017.03.21.15.44.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Mar 2017 15:44:05 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2017 22:43:58 +0000 Message-Id: <20170321224358.21315-4-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170321224358.21315-1-sw@jkqxz.net> References: <20170321224358.21315-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 4/4] vaapi_vp9: Mark as async-safe 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 was missed in e0cd598bc4684654d63942e9ff4872c0b48a7dc2 because it isn't in libav. libavcodec/vaapi_vp9.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c index a656ffb13c..7374465d49 100644 --- a/libavcodec/vaapi_vp9.c +++ b/libavcodec/vaapi_vp9.c @@ -21,6 +21,8 @@ */ #include "libavutil/pixdesc.h" + +#include "hwaccel.h" #include "vaapi_decode.h" #include "vp9.h" @@ -178,4 +180,5 @@ AVHWAccel ff_vp9_vaapi_hwaccel = { .init = ff_vaapi_decode_init, .uninit = ff_vaapi_decode_uninit, .priv_data_size = sizeof(VAAPIDecodeContext), + .caps_internal = HWACCEL_CAP_ASYNC_SAFE, };