From patchwork Wed Sep 16 06:44:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 22431 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 3451A449470 for ; Wed, 16 Sep 2020 09:49:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F86368BC2D; Wed, 16 Sep 2020 09:49:42 +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 8465068B966 for ; Wed, 16 Sep 2020 09:49:34 +0300 (EEST) IronPort-SDR: c4UGIyTv/q+UWedPwB4VXgKrwGkS7G0509CzmjK5jixx+in+o7NSfWk2nYyv6WuG23VheRfqz2 8AGoPr5BCEDQ== X-IronPort-AV: E=McAfee;i="6000,8403,9745"; a="158693661" X-IronPort-AV: E=Sophos;i="5.76,431,1592895600"; d="scan'208";a="158693661" 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:28 -0700 IronPort-SDR: Mkpgy7lUsVT7GgQ5vFNwBTQJZnOjU6r/6S1QADj9nbKKac/06zDhm/KiR7c92KAPEawSjJRqFm 1teloKYpqnlA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,431,1592895600"; d="scan'208";a="331551231" Received: from xhh-tgl64.sh.intel.com ([10.239.159.152]) by fmsmga004.fm.intel.com with ESMTP; 15 Sep 2020 23:49:28 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Sep 2020 14:44:55 +0800 Message-Id: <20200916064457.181230-5-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 4/6] qsvenc: libmfx no longer supports multi-frame encode 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.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 77f886981c..9f3dc0b2ad 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -64,7 +64,7 @@ #define QSV_HAVE_ICQ QSV_VERSION_ATLEAST(1, 28) #define QSV_HAVE_VCM 0 #define QSV_HAVE_QVBR QSV_VERSION_ATLEAST(1, 28) -#define QSV_HAVE_MF QSV_VERSION_ATLEAST(1, 25) +#define QSV_HAVE_MF QSV_VERSION_ATLEAST(1, 25) && !QSV_VERSION_ATLEAST(2, 0) #endif #if !QSV_HAVE_LA_DS