From patchwork Sun Jan 8 18:10:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 2108 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6753202vsb; Sun, 8 Jan 2017 10:10:39 -0800 (PST) X-Received: by 10.28.183.215 with SMTP id h206mr3189576wmf.60.1483899039093; Sun, 08 Jan 2017 10:10:39 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i14si62291538wjs.228.2017.01.08.10.10.38; Sun, 08 Jan 2017 10:10:39 -0800 (PST) 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 0C14668A52E; Sun, 8 Jan 2017 20:10:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f179.google.com (mail-wj0-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30735689D47 for ; Sun, 8 Jan 2017 20:10:23 +0200 (EET) Received: by mail-wj0-f179.google.com with SMTP id tn15so57140948wjb.1 for ; Sun, 08 Jan 2017 10:10:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=jAfycdufRJacd4fO4m4GFEJBt4AbveFhnvT8oSo3Wxo=; b=PPuPSCmprqivMVvIL/8Tz5SCaZhT42c/bixyNpMLcIG6vhDH5/h/wDim/lA+u6pu1Z mvRKWvBcu1/XRrhQIxaIV+vuvL5117hsJ80UZZG8LrlUDJGASdE0JSpEicHhHXcCpzf7 YNiFy9u+FuQgpKtuDDBSbtsCPFj55xqsErQkctDNSPMPTRP/Ncx6hjtHiYX7trQCyQSa sXR3deriltRdgg1Tz6fL6TyrJdo7N+ye0GD4TeGIvkaEgbrh4Yk+pMsLD9zOBYlLAEJL s8vnN+SNrsxLHof/MKsBFG8agkqYKLvzJk8BX/+8O0dQMsUDR2ZtnfvT1HStHRax648e H/9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=jAfycdufRJacd4fO4m4GFEJBt4AbveFhnvT8oSo3Wxo=; b=jnEP7slOBN2ohPu0beQXZKa1/QChN115gfFDKKGsN2RZhOO+vBBg1BtHdE/9ITLEru cQzkITSqnW8AGses37PvPXCg+eXsdBGIidJB6tsAiIp04Ys3yEkV085oVrat0fDFiotz JqdfqUIOGk7DxGhmi5KokX1i04H3TQfeDr5CguaoNkuY+VdF+HUW/VjIWM0H9670G6v2 yLkvZ/D1mY3ZON9wn3w5BhrF+MET68D7mIzLjKywBsPp+p/PMV7exCQ50Y2BKmL0NYTA wFrEUuxXGWHffBSPCiNU7VduKwdwyNJ3H2LUfT5FjfGCAxuUs6+DjmiUVLIdps01VJGg bt9Q== X-Gm-Message-State: AIkVDXJ0O2WNtPLAqriTcp9F8Zwyxs7stuyJwJDD/QYZu3cm0veKppnkvFvtylyabhtmiA== X-Received: by 10.194.246.1 with SMTP id xs1mr57568878wjc.204.1483899029329; Sun, 08 Jan 2017 10:10:29 -0800 (PST) Received: from [192.168.0.8] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id d85sm14616226wmd.17.2017.01.08.10.10.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2017 10:10:28 -0800 (PST) To: FFmpeg development discussions and patches References: <320e2652-f3d9-5509-11ac-fbd84e22db6a@jkqxz.net> From: Mark Thompson Message-ID: Date: Sun, 8 Jan 2017 18:10:28 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <320e2652-f3d9-5509-11ac-fbd84e22db6a@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 04/16] vaapi_vc1: Remove redundant version check 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The lowest supported VAAPI version is 0.34 (checked at configure time), so this test is no longer needed. (cherry picked from commit 5a667322f5cb0e77c15891fc06725c19d8f3314f) --- libavcodec/vaapi_vc1.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 7a9b8d3920..17e35e6a3e 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -171,9 +171,7 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t pic_param->sequence_fields.bits.syncmarker = v->resync_marker; pic_param->sequence_fields.bits.rangered = v->rangered; pic_param->sequence_fields.bits.max_b_frames = s->avctx->max_b_frames; -#if VA_CHECK_VERSION(0,32,0) pic_param->sequence_fields.bits.profile = v->profile; -#endif pic_param->coded_width = s->avctx->coded_width; pic_param->coded_height = s->avctx->coded_height; pic_param->entrypoint_fields.value = 0; /* reset all bits */