From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 86E1E43237 for ; Wed, 25 May 2022 09:38:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A491368B509; Wed, 25 May 2022 12:38:55 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2021.outbound.protection.outlook.com [40.92.90.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FFEB68B1A6 for ; Wed, 25 May 2022 12:38:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DaaqTKPkEtEHPV8RBQLQ/6i25W79529AwERusyBMpgIwPtblsVjKmqp1LtxnM7dWa6ew7P7bzGoBoVALRCKPkabwZhTQY1R9oobNKmhZ1AtwLvGa6h/IYbdPYU2d4WufAZIlzK04IuANgrl1Bhl95kKbJub1DVxQdazciKVGvCLWYDzmilwIXdqHFvwN0sijuUpkD3kEn6O5/kUfip7eCVanN6h1Im2F8g/caeMf2K0kmeeVHyR42kLZV74SQOOhfq7jvc5vqtIxZArJ4bUGFZTGMMgPrFFxFAvrC1KIOiD908k5fjyFaqGffP+AN8BBTgG5pEWob8jKSmBQ1ojBFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wFWODAMV5ubt+Du5Wz8PrMmJxS9TfZIsQ8yy4qpiXWc=; b=mCiHExkT44kDTHLK/N1b0ui7y8Cdg71GAo8gmC2ndFF6MPPW6FgtQ1QProYC4SWI5hc4+Y6dYTaV2nxO8uO+uTXCnKASg58hcqsGcexNjdaD5cAf6rTHCV9Xe6X/OSdXl3DguSzPbKVLTyk0797ZVPk8AS3Qwareb+Kb0LBgLZkFA1ImWtsJFfSzHHFwrokV7/V8SsroXqydJ+IBL9nl+4aREYxLldil+isO5NBu4ndQUToEgccD55kyP9k9Su+rv0KJCbTxVzYk+kxO8L5vUvYOaeqS0k4AuqH9aZDQmwnpM2LWtvZObPxkXvkGSR+Q1iUH6jxIvNTHhkDptmqW+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wFWODAMV5ubt+Du5Wz8PrMmJxS9TfZIsQ8yy4qpiXWc=; b=aaWNT8YS3QtSM1LMyfzz9F05UM3WH0DkI8qVCNIdnfZikxhVvl6f+zJvHVHPn+AZeiRjq5VQSCKOq5rpcX5v14U+ZQllmtHuYklEq3ciKybNCzV6isbBG7dylykCjqCcHczBAaeg+3rBxs+qeGiLUja08sF+ccp4wuZ+tWHQY8/CdRmcredsFre0ImPl4BMPQ/61Avu1yFis6RBwqCPEsU0dlcwfFUbZ73n1fDwQwkrkioYqtDn5zLHlFatGG2/pLpN4KaWW8MIGd90gzpwHbasiu4nhHKguZdgNQoHex9gPj+Z2Xdk1k5bqRqOqWhCWKdYDQDiIASewkRDX32RR2Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR01MB3901.eurprd01.prod.exchangelabs.com (2603:10a6:802:69::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.18; Wed, 25 May 2022 09:38:47 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5273.023; Wed, 25 May 2022 09:38:47 +0000 Message-ID: Date: Wed, 25 May 2022 11:38:45 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [+pNpF8Iipr3DOSYdstuCKdwTnlT2PTsz] X-ClientProxiedBy: ZR0P278CA0027.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::14) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <31523882-fe35-94c9-1f2f-17419de20d46@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9be39c2b-02fc-4940-cdae-08da3e325da1 X-MS-TrafficTypeDiagnostic: VI1PR01MB3901:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q7paGvsRzXz6qnztxc8061KqMXmNUJOZPuXzxjVFH1UOsj54GanG4kW6v6L9e6HsTZ/LhqIEZehwHH6XDqhWcZfAnYVImIS7ZYNF7iiepkLH4thUEaevidAJcYST9MxZ9TA/KntXZtz9fO2VBp0cj8d+Dl3xOfabE0sl2nbw6ht+CKdzJxeG6RvfGDdYmrEo5SFUaxTorfi8ZhqtVpS1+cQYnSlH0LOdDWJztxldNdL3alz/w+R0bk6XGJuS4ee1xe3S2YhczmDByuh0thnxLY0V/7BJrhrg+V9Kg45aXVr1fNhBhxkFQfHMluZMx9DZ6WBRAYTy19ak7V9OZTMOQLkdmoa2CmZ9BaqXchEIQgAaKD+i/1G0xbPfNcik7V0m05OJg1mNBa26ts4tmC2La3wXQqsp5nV70QzXlX8zkMDnF/DLYw4x0crtQDroSU/dO5749g05FTlPuDfHy5DPQHp2h4riqbkdrtOEbD822IN4pSWRt6edt+6p7kdR9g0JqCd/TESJI/5rHQOn8Dw6iy/zRAfvI28PXaFEfREkttSdHGOozEoBZFHMKC1GvfsoF/CUK8oU9HZsYt49iIvOGATnPOUnUZmzM9HO4pypVmd1E2v86K9MoohlFSP3gjZW4pdhcNWb8e0jr6y6NAug4J3xHzgSBuY+kwmOaVGVDoM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VHFvdlFZWkxPa0dPV0k1NGF3SFYrNm9na2VoN3J3WjdHSTZFd1RFTHhKdWF2?= =?utf-8?B?MkJtOENRR0psM3lRTW9VQnRuRW1nQmpaYkcycHhzbnRnNElxOExFaEZlRXJW?= =?utf-8?B?NkRBS004S2FOTVZxZ2dOOEUwZTdvNlp5NWpMcFhqWGxXMTZGeXZZMzZOWTFJ?= =?utf-8?B?REUvS2l6d0FRd3kzVFhIZXdJVU5aOU92UFU2MXAzNnA4LzM3Ym9yUTVlSmU1?= =?utf-8?B?UGQ1amJkTW1tZzIxMmlFRzduQnZ4RDhBekExYTVPNFgwWGhqMTV4YXF4alRq?= =?utf-8?B?NmJKeFZMazE0Vzg0QkxtakVSYTA1YlgyWG1iRDFoUnd0bk94aDlhRWMwWUhX?= =?utf-8?B?VzZRRm5rQ2RzeURCWjk5TWNaOEU0aVZ1Z1pWY1FIekI4bHhaN2kreDJVUUd4?= =?utf-8?B?YUpjd0RMYmFqdEZaNHA2S2NzWnNIVndUNnplWnVJZnBuRjdGOUhXa210RExr?= =?utf-8?B?QzhsdWpXV1BzRDVGb2c4VGxiM2dsRGVDWWNtc04yOHZ1NjdDbVEzQVVzZzlI?= =?utf-8?B?VlQzaEVUZG1KVGtqZm9oWTdZczdTT0kzZVgxODhuaFhnRVE0cWFGU1lkUFpY?= =?utf-8?B?V2dKdmVhMWZtbXRUczIwNWtwYnlFYit2QnN4clR6Nks0bTljVmVST0QxSFJo?= =?utf-8?B?QVNwQm1CL2RvMkl4MERCVTN6YklYNnBIOEZVdUFzR0xQcldKK01Kc2s1Z1RD?= =?utf-8?B?VzVXZ2FhQUNyVXUzVmhQajBUNWJUeXNXRzA5UG1Ga01pMmFHVVZNVHlhYW0w?= =?utf-8?B?SUVsK0VqSXByYUg0YWtMWGpsZm5DRjVlQmhiZ0dvck1tUk0vTXJiamtMaW5Y?= =?utf-8?B?VXY0Q0tBU2N1ZURHYVkxMDFFV052amNGMytmbWt0M01Hc2VVUzB5aktLM0gy?= =?utf-8?B?VzZBbE5PeWVVOEtnbVNTSE5jTWxTc3Z2ZVArQS9BUTFoWndualdOL1FFUGo1?= =?utf-8?B?U3o5azN0bDFaUzJjREVYenMrTnFjQzR5VnFQNlhla3JzWDN2ZkFUUmN0K3cv?= =?utf-8?B?K2Vrd0dxc2xxZVdDZXY0dkZSUFduQ2VzcWJZY3Z1U0o2RTh1eStyU1I2TVJG?= =?utf-8?B?OENpZ3pna21jazdxczdFcEpMVFRRalhlRlI5Q0tIMnpvbHhKYUxXSXdaLy90?= =?utf-8?B?eVRieTZndUYrc1AyQWpyejNabkZEUjNWMHVTc1poTi9NZ1Ewa0ZKd08zam50?= =?utf-8?B?U1dPUkRnWTNRcmdpYlJjeS9ZeDR5aXJjRm81U2hmdlJVbk9hcWxtVkVCU1Z6?= =?utf-8?B?TzRocGw5aFlZRWxWY2RtcnRpUlUyMUJSTGthdmUrelQ4Ykh4MncrQVoxYVRQ?= =?utf-8?B?eDFnQnVjL0U5dk81MnF1NUJFcDhDVGg2dUc3QkRINHk0bk9VRDZ1UVVuNFI5?= =?utf-8?B?UVlRR2RWem4vbW1sbXIyMzdJL0RaWTJhNnY0RXM0ak1ZeFRpWm5JOW4zNzU4?= =?utf-8?B?WXdBUCtYeDVhY00zTitCcEErRGxZYUhpeEhaMktUY1U0S1dCTnRBc2J6a0kw?= =?utf-8?B?MDNNdXdhYm1JVCt0U0N3TEh6UXhPQzhUNmhjVW04akZYeUJySVo3eG9XeVY2?= =?utf-8?B?NHVFNmg0dWg1N1lnUmNSSkt5WjY1TzZ3b3k4WWlsS3R4ZDdzajBMa2YwbnAy?= =?utf-8?B?U3M0UkRmcHdjMHdEdDRoVjJuRlJZbVpPVE4zWTd4Y1BzeU5DdnBudThnY2d1?= =?utf-8?B?bkJsUU0rZ3dOMVYySk4xRlppNk5vNWZYZWVNY3p0R0FlMC9PRjduUUxmTWI3?= =?utf-8?B?R3YrMm9WdWlXbk4xMTd4U21Ubys4L3VMOHZpM3J4QzhIV1FGa1Iva3hQZkNa?= =?utf-8?B?dWVoOStQN3hyMUpyVjBObFo1NTdnOGpCL2FPZzE3UCtwekVOVnBTZUJYYWJH?= =?utf-8?B?NXdiN21aK1B4NlhiMEsyS0VNL3pnS3VHRk9Jb1d5elg0MDQ5Q1ZFN0YrSnB1?= =?utf-8?B?R0plL1M3c2IwUm9Cd1NEZFM5UzdFKzJjODZkRjBmN0JRRFhRYXZuZ01sWC9Z?= =?utf-8?B?bVRPNkN0bW93PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9be39c2b-02fc-4940-cdae-08da3e325da1 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 09:38:47.0424 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR01MB3901 Subject: Re: [FFmpeg-devel] [PATCH v3] libx264: Set min build version to 158 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Matt Oliver: > From: Matt Oliver > > Was "[PATCH] libx264: Do not explicitly set X264_API_IMPORTS" > > Setting X264_API_IMPORTS only affects msvc builds and it breaks > linking to static builds (although is required for shared builds). > This flag is set by x264 in its pkgconfig as required since build > 158 (a615f027ed172e2dd5380e736d487aa858a0c4ff) from July 2019. > So this patch updates configure to require a newer x264 build that > correctly sets the imports flag. > > The requirement for 158 is applied for msvc builds only, > no change is made for all other cases. > > Co-authored-by: softworkz > Signed-off-by: softworkz > Signed-off-by: Matt Oliver > --- > libx264: Set min build version to 158 > > I'm submitting this patch on behalf of Matt with his permission. > > There was agreement that the >= 158 version requirement should be > applied to MSVC builds only. > > v2: restrict the version requirement to msvc builds > v3: fix unintended author change > > Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-30%2Fsoftworkz%2Fsubmit_x264_api_imports_matt-v3 > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-30/softworkz/submit_x264_api_imports_matt-v3 > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/30 > > Range-diff vs v2: > > 1: 1696684de3 ! 1: 374130a09e libx264: Set min build version to 158 > @@ > ## Metadata ## > -Author: softworkz > +Author: Matt Oliver > > ## Commit message ## > libx264: Set min build version to 158 > > > configure | 8 +++----- > libavcodec/libx264.c | 4 ---- > 2 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/configure b/configure > index f115b21064..9de9b7763a 100755 > --- a/configure > +++ b/configure > @@ -6656,11 +6656,9 @@ enabled libvpx && { > enabled libwebp && { > enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion > enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } > -enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode || > - { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && > - warn "using libx264 without pkg-config"; } } && > - require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && > - check_cpp_condition libx262 x264.h "X264_MPEG2" > +enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && > + require_cpp_condition libx264 x264.h "X264_BUILD >= 158" || > + { "$toolchain" != msvc && require_cpp_condition libx264 x264.h "X264_BUILD >= 118"; } IIRC this is equivalent to { enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && require_cpp_condition libx264 x264.h "X264_BUILD >= 158" } || { "$toolchain" != msvc && require_cpp_condition libx264 x264.h "X264_BUILD >= 118"; } which is not whan you want as the ""$toolchain" != msvc && require_cpp_condition libx264 x264.h "X264_BUILD >= 118";" is executed even if libx264 is not even enabled. > enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && > require_cpp_condition libx265 x265.h "X265_BUILD >= 70" > enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" > diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c > index 4ce3791ae8..14177b3016 100644 > --- a/libavcodec/libx264.c > +++ b/libavcodec/libx264.c > @@ -37,10 +37,6 @@ > #include "atsc_a53.h" > #include "sei.h" > > -#if defined(_MSC_VER) > -#define X264_API_IMPORTS 1 > -#endif > - > #include > #include > #include > > base-commit: b033913d1c5998a29dfd13e9906dd707ff6eff12 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".