From patchwork Tue Mar 21 22:43:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 3051 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp47446vsy; Tue, 21 Mar 2017 15:44:29 -0700 (PDT) X-Received: by 10.28.73.196 with SMTP id w187mr4591988wma.5.1490136269797; Tue, 21 Mar 2017 15:44:29 -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 j73si11489025wmg.109.2017.03.21.15.44.29; Tue, 21 Mar 2017 15:44:29 -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 692B1688361; Wed, 22 Mar 2017 00:43:54 +0200 (EET) 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 3825C688326 for ; Wed, 22 Mar 2017 00:43:47 +0200 (EET) Received: by mail-wm0-f51.google.com with SMTP id u132so22491891wmg.0 for ; Tue, 21 Mar 2017 15:44:05 -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=Y62Yd9snnxYMXMpfzYls4eaJe1ugJk/it5c42LBj1mI=; b=hJg2jtYmdX5nysvD74E3Un62aTwrH5yMDUZg9EjLuupKFahSCnQKgClVwc0gKlKxMS RYbuO3cf0k1GPEt0gez6bJ8PLO+HdplNsvOghLu44oyIP23Vf2CIoOVypKk4mJX2eNkU eCWNqjwsHAzp3GtzmL5CIS7aksn8yym0wCtyVo6ZgIYs1L7JgUEtrWEcN8APd+trT1XS rcSMAKfvSvtx0aNXtvyy27naFVCu6KFOWnNQoPb9f8mHEHKsAIemJkZ2ykbIPPinwpeI dDQOHNJwN+kWwPLHdjivMwB6+gWAKHYaZZjnDm1ktJBWSuMKA+8qJiivhrY8UK7fuV2f tWHg== 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=Y62Yd9snnxYMXMpfzYls4eaJe1ugJk/it5c42LBj1mI=; b=aJFMxZ5ezoJFwKTBzE4pBRYeiNN4trMHsigDCNQyGcZsGNgeNSSG9vHFUS2fzcDlwd WOrx3cv9MuD9fePqZCPqTnoN1r8ejFXbywgTjGhxfXXDaBNrLEUAdQ5CS9NeKGyRi0lJ HLUlfrnWGbASUCGZEpytc+13MDLgN7MLbT/GmXiHVA1JmKT7TxU8st3jJVk66pXxrIXi HtqXPo9kIypw6UdMTcntT2uWD4a0IJlZkre9k7D4UFRF4RvfJhmpHRt0tn3vl4PtlaQi So69wuTPxGENFjidARoxC2fayNBMuSvLVYx6L7IbFIyI2oI+jV8zOKxCDfwBv6SdCRsL Gldw== X-Gm-Message-State: AFeK/H2NweXVIs5WCQ1w+/Jw8msLvfKyKAjtaj9Oh0IyxWogj6IFDr/IRFWsp2w7tPHnwQ== X-Received: by 10.28.173.193 with SMTP id w184mr5023398wme.106.1490136245210; Tue, 21 Mar 2017 15:44:05 -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.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Mar 2017 15:44:04 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2017 22:43:57 +0000 Message-Id: <20170321224358.21315-3-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 3/4] vaapi_hevc: 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 wasn't in libav at the time. libavcodec/vaapi_hevc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index 2b0e8ff326..34d32795b7 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -25,6 +25,7 @@ #include "avcodec.h" #include "hevc.h" +#include "hwaccel.h" #include "vaapi_decode.h" typedef struct VAAPIDecodePictureHEVC { @@ -434,4 +435,5 @@ AVHWAccel ff_hevc_vaapi_hwaccel = { .init = ff_vaapi_decode_init, .uninit = ff_vaapi_decode_uninit, .priv_data_size = sizeof(VAAPIDecodeContext), + .caps_internal = HWACCEL_CAP_ASYNC_SAFE, };