From patchwork Wed Sep 16 06:44:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 22432 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 379C4449470 for ; Wed, 16 Sep 2020 09:49:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1613768BC53; Wed, 16 Sep 2020 09:49:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8970668BBF1 for ; Wed, 16 Sep 2020 09:49:36 +0300 (EEST) IronPort-SDR: xZvHzlXBFKbojxaYOCjAnNchmpfWM4FmnkwZrSvDnhZUU571GI5fpSyMsJFw3md6Rk97EDtCp0 fuQDjOKsYMxw== X-IronPort-AV: E=McAfee;i="6000,8403,9745"; a="158693662" X-IronPort-AV: E=Sophos;i="5.76,431,1592895600"; d="scan'208";a="158693662" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2020 23:49:29 -0700 IronPort-SDR: t3qZakYPbY8NTJmqo1jWC+ei7dFSNdOSt9aYxoCuHF4CRmAA3zCV8QZ0K0dAHk2JyRPz1vUvO0 NDQrxPbMQbXA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,431,1592895600"; d="scan'208";a="331551236" Received: from xhh-tgl64.sh.intel.com ([10.239.159.152]) by fmsmga004.fm.intel.com with ESMTP; 15 Sep 2020 23:49:29 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Sep 2020 14:44:56 +0800 Message-Id: <20200916064457.181230-6-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200916064457.181230-1-haihao.xiang@intel.com> References: <20200916064457.181230-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] qsvenc: libmfx no longer supports MFX_RATECONTROL_LA_EXT since version 2.0 (oneVPL) 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 3c66eed554..88a8a99517 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -100,7 +100,7 @@ static const struct { #if QSV_HAVE_VCM { MFX_RATECONTROL_VCM, "VCM" }, #endif -#if QSV_VERSION_ATLEAST(1, 10) +#if QSV_VERSION_ATLEAST(1, 10) && !QSV_VERSION_ATLEAST(2, 0) { MFX_RATECONTROL_LA_EXT, "LA_EXT" }, #endif #if QSV_HAVE_LA_HRD