From patchwork Thu May 26 02:32:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 35936 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp157772pzj; Wed, 25 May 2022 19:33:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbtJH4U7Mv/yAQPd5Kycbv7zC0rkK0miV1GrpVSJmsPs9W9h1WOxmPrHJZNY8x5ClJtEv9 X-Received: by 2002:aa7:d789:0:b0:42b:cf4e:d585 with SMTP id s9-20020aa7d789000000b0042bcf4ed585mr4405506edq.321.1653532400500; Wed, 25 May 2022 19:33:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653532400; cv=none; d=google.com; s=arc-20160816; b=ftTeOgf10BA/M+6dDhGAgHWysfcaZa0IX3H8A1HSmfvu5LtDgkHtGT5dgUlPwH5xmk pMi1C7i7Q3a44fNdOpLj3cQh+JMSGZCvBgSt85/M8dSzsOC92IJJhJOq2UXIqya17zSK VSYMa0lcGi3kvcDFieiJ3zvQjZTcNt6HkAHT6RbLhe5kXWMIk1LnpqvDMMJK5NTDs5W7 rHTqXvxrZaI0rEdmkc6Cx3LSEFjwdmqeYnmiivjnOJiUW2a22a2lVDTp3gGVs1jI93n1 g9MeNfl4pjhsBukBt4lr5MjYFhcbqxkPOrNlvPRb7TYYb4d7c/x7SiF++DRWayMNFb++ lpGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=kTlk9IM2pKAYuS0LoIFEdxuhM4+c88T1V1jZfJtF/UU=; b=koz2uSnU98J6fHbD3Y+i5KBvWxW5knq3wsUDKm8Wx2DkS057e63T6cIxqiw+XsFrqu 8DH10txmNWabkcky+FtJDTBnR6PDqsRbHF88xsofaz55jPwM+vtAVDrJmCtowujG9pkQ DJxlYP0ZnAvC6quaG9GoMVGBB1lihrp37WPEtxl9ixs+L0wdLKECsi8+zwBT88ARorpP 4i6Pmw8aZTazPo9rO7qF3PxlSSA2rOdnljYHA8eag/Ct2BbOJBI2nntWsnUmkz+ZMGA3 PcZ9KovREsJgp/y1Ktv1U5GjXJXa2LZXITFc7pPykpbmwF2AOX4J5stYdgSzaiKIlPJn l3cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=lHmvPmAn; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qb36-20020a1709077ea400b006ff232a244esi288029ejc.731.2022.05.25.19.33.19; Wed, 25 May 2022 19:33:20 -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=@intel.com header.s=Intel header.b=lHmvPmAn; 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 BA8B468B58D; Thu, 26 May 2022 05:33:15 +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 A345468B407 for ; Thu, 26 May 2022 05:33:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653532393; x=1685068393; h=from:to:cc:subject:date:message-id; bh=CVfBAGWrSQEYez8r2Lk6yeh9Trtud24YvHlU3k7k96o=; b=lHmvPmAn8AL+G0obK52RMQ5nFtwN03EItk6PBd8at8pKBd6vlDXSSAyw Fiy/n85MyhLn0gZEpjk0FHPNl7vcPDybNAbTeL052EZ5xzP3K0hO/4jkc 3Ht7SIa7jTB9Rir0bLtvMs0nENSia9OmJh6E09eXCi68oCY9njzqPRxV/ 2TFen+qL3/R9BTQysyopX6E9DB73iLnucHJofhMZfECuSY7pj5UKntyWH i0rGYYJZPK5U0goeSo9PfFVqOeQX7rlrFdy4qUWFC6ognVhFgN5h/qaNp GoT9UShrTYIzNqizy2Qxc+gWOHxgPVCmg3oHv0CXiEOcFyLIZ7+YePmJf w==; X-IronPort-AV: E=McAfee;i="6400,9594,10358"; a="274108845" X-IronPort-AV: E=Sophos;i="5.91,252,1647327600"; d="scan'208";a="274108845" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2022 19:33:05 -0700 X-IronPort-AV: E=Sophos;i="5.91,252,1647327600"; d="scan'208";a="602681029" Received: from swang11-mobl.ccr.corp.intel.com (HELO hxiang-desk.ccr.corp.intel.com) ([10.254.208.181]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2022 19:33:03 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 May 2022 10:32:26 +0800 Message-Id: <20220526023226.3728-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] qsv: check for libmfx.pc instead of mfx.pc X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: v3KC9IlZdw5V This fixed the regression caused by commit 478e1a98a Reported-by: Timo Rothenpieler Signed-off-by: Haihao Xiang --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 6cf7d89674..5a167613a4 100755 --- a/configure +++ b/configure @@ -6565,7 +6565,7 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_ # Media SDK or Intel Media Server Studio, these don't come with # pkg-config support. Instead, users should make sure that the build # can find the libraries and headers through other means. -enabled libmfx && { check_pkg_config libmfx "mfx >= 1.28" "mfx/mfxvideo.h" MFXInit || +enabled libmfx && { check_pkg_config libmfx "libmfx >= 1.28" "mfx/mfxvideo.h" MFXInit || { require libmfx "mfx/mfxvideo.h mfx/mfxdefs.h" MFXInit "-llibmfx $advapi32_extralibs" && { test_cpp_condition mfx/mfxdefs.h "MFX_VERSION >= 1028" || die "ERROR: libmfx version must be >= 1.28"; } && warn "using libmfx without pkg-config"; } }