From patchwork Tue May 11 01:25:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27711 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3519644iof; Mon, 10 May 2021 18:26:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoKwwqVHW4GcUxXtsxvzjIKQFQfBuieYR6xwtcTml8xIy/fw1KYBKRMiUd4jmsTci2Na7Z X-Received: by 2002:a17:906:c218:: with SMTP id d24mr28142667ejz.363.1620696367761; Mon, 10 May 2021 18:26:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m11si15187480edp.564.2021.05.10.18.26.07; Mon, 10 May 2021 18:26:07 -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=@outlook.com header.s=selector1 header.b=rnf5WeVf; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A17F06809D5; Tue, 11 May 2021 04:26:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2088.outbound.protection.outlook.com [40.92.16.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D8E96802A2 for ; Tue, 11 May 2021 04:25:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UjhvcuUm2954TR/m3YpKolnNCkRTVx1UEn0TpxHF7jBjJ+AcdBbYLxJDkKklqun+kNlSj6zmnK2KvTJHuTl7gkBGe5VMBo8XdqQOpyTWRCDVbgrEw8cUcmnFlAzvgE1uPJydq+Aq6dXDgeM8530miXCQ/DY+19Nt19vbec4FVUILcjBaZIDvVLwK4FhW9XyBSUZtRRpRbqCVSIkKPU5iyLMXuzRRqAxTuRfjClgt8LlUNiVlvQLf3lQMziNwE9Nt8vQy0ooF9MVlMDO+cWB9PrZZFBPjn9ry+OD69nm2bp4uU1EjX3OWimCfJL2TLJuTociYpmxQLDae5uZSlnfL9g== 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-SenderADCheck; bh=SxcHhu1zlrbW/CPunOUUZD2VFbzGl60MUn30fGxXy6Q=; b=ZpibylON6RIl0azEr+W7bSGRYlXASqXcAoIIKQHOxitBoe4DBft8CPlUKF8bTZCOA/VkKXqI2fj/bgcN50tA8/nSkIquowPeJseC9WIWQ9Ukaob3QYkvkpyrmRURXlYdgp45rJpIetjnob8izJyHNsFQby0mPzjQgP7K1L2aZbRtbpTixCxPNgAOsCh7Ojdue5iN4XMBz65Qvzy2qdRwJ1SlCXoJ0mhVF4X0YcB0VXa0udmvXZhmUg9RNhlTHwLxTaR0svCfxbxB97ZkFj0Vo6C1VpLbSOgrtdTVlmGjzk8+Wvstj3gK99xccP4SsO0Swc6rQfyKtLaznj2sxSTcGg== 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=SxcHhu1zlrbW/CPunOUUZD2VFbzGl60MUn30fGxXy6Q=; b=rnf5WeVfAoNP9cBoB3iAM8nACOV8b/+sxCk4qDKf75iH8ERw3y0GIRfu8GyTmsO/eSIHPA8Pik+/ZmamiEWZAvz5BrV3R0Lc0LmDMewTyrQOsrqcMSEvMQ4cTqObNV9Oite9j5YM7eo+0ez22gmi9NE+xuSPOOGM5chcgQbUsngypP7jhrTy8+MAe0LLsubU2YqSQyl2G2aWUlYf+Fw85gAPnFXAR4WZZbV7HRMgNJNTPQij7+VIcwjaMN8BW5LKKJrhQXA6g9udd244QldEfh4dzyxYl8x7ryzFd5YmG+js7X17MeUPH471aKSU7akWsNlZB2KY9NBIV2Bar9ajXA== Received: from DB8EUR06FT051.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::44) by DB8EUR06HT010.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Tue, 11 May 2021 01:25:56 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::47) by DB8EUR06FT051.mail.protection.outlook.com (2a01:111:e400:fc35::279) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Tue, 11 May 2021 01:25:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B2A48E137B12431D211470E43DE50AA275D6571A9368A882594200E63A98FDA3; UpperCasedChecksum:665C15CE6C6819485DB1094C44D67CE44A187AB972883FFC92420ACD4198619D; SizeAsReceived:7425; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.032; Tue, 11 May 2021 01:25:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 May 2021 03:25:46 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [M1paVQR1T/oE4VZRJ+F8vTXnX5f8kJl3rvpHsYBHPNY=] X-ClientProxiedBy: AM4PR0902CA0020.eurprd09.prod.outlook.com (2603:10a6:200:9b::30) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210511012546.179996-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM4PR0902CA0020.eurprd09.prod.outlook.com (2603:10a6:200:9b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Tue, 11 May 2021 01:25:55 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 99986cf5-1cf1-4cb3-35af-08d9141bb92b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWW/OkO5f2UCh4CE+YbReaGIEPAqBxzfwYOmiaTh47YIQ4Hbrc5G6MX6iO3L376T94s+PSBPS/SCC00OQUr2q9Yuyp3imYDT2kUWFJ2NtJXKQ5+F4UvF20EymW62veYQ5ni2i7QM9pL2eipHDjPZrH3WjwxE/oBQiIGuxi5dcOILijEO8bWB9lyAoM6UgDP9sCNHiG8hzNQzGw0w+0ATI8ovlxNjN2bmx17LNK1RQKzd7xzn5nr4n6Zmo6J0evN0NmZyRmxPDMMg86DqdP1QPYqERi3v+2OAbnyd8gnwGHw7RPCQB4pojaU5kKDLCNBYbEkyop4rHodk2IcAYi3zg6dqtOau+DqPS5kmUt5BFr7SYQtOwLHP+zrgmQOOUKmaplgu3dd1fq4L0+hqFyxA4c+DtS4494KT7r9adTUECQOQCAQAAjM/6vNfgwnoepPOlJFx0C5zwL1LxsE7kex2KQyjohlBST+iAL/3AwLi1Cva4YjIl6BffYnpLLFFpneMdQg0U/uqVYC75CeoeCLUxlNi/auWK4w9bm9lv1RHPgf6zBlsne6NWGSul1WabRZf7zYBS5MTDd09bFgspBNwddcVEuInwgvda8kw/R0sprAKFw5YT+yqtR6LoHOlzapLyurUdgzd0Pp/H1W8c2QUs6MqjvXffotYm8pgMTNDZQck1rcS9MuD3+5PtLrJwz+hmDRVDhu/WjTXD24GwmwOrz3XSMZITQlLDc= X-MS-TrafficTypeDiagnostic: DB8EUR06HT010: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: owhTRdXPmLBSl8Rlyc4XSWlYcB5RNVoZc80CZWvRpoagIK2j3yjClQlgaEKD0Y0xRRIGd7q7tHWVVygSid8N5g3Pf8+pvagdG7DyYzrdeceH87fNig8G7tlThIQ32BodKyLmJm5/NQakTJBrK9960R1o+CxsubzoNyEd2SQb0WN5wvER1qPnLK+G5cRm8Imdj+dUyQ4hqm/5f+Qx6yNVabEYyY0Nk1jFMMxI8woYqmP19fZBC6HYap+NuTC8ryLyRIYW1RLih9IbnaNM+ugl7HsXP4Tu9/p8DoFhTwOaA3sKR18r8fnK6pOtQzI1Yrrgpjyg9EaSTtnt1uxgpkYQMapf3Y/ln3LmZYkLeCxbR231kujXHcc5bUoZ38tJ/WVx+0B05Zx5b0vd2E74NDTH7w== X-MS-Exchange-AntiSpam-MessageData: rAEU+CHwAKWG+IqQzUBF3+5ddDOgHvXkRjDss3iz3s8NHCpspOFbOZgjOWqcz6BPJ1ecYdJO+M8vV9vT1VmdP/NhREu47K2M8d2al+y/GrSLqfgcsCRuIfzljnYeJXQ/ARkfHkP0X3a2qmNAI8fThA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99986cf5-1cf1-4cb3-35af-08d9141bb92b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2021 01:25:55.6093 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT051.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT010 Subject: [FFmpeg-devel] [PATCH] avcodec/allcodecs: Don't include libx264 twice in the list of codecs 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: E3kYZUmxdrtx Since a247ac640df3da573cd661065bf53f37863e2b46, allcodecs.c contained two lines that matched the regex used by find_filters_extern in configure; as a result, libx264 appeared twice the list of codecs (if enabled). Fix this by using only one matching line by adding a preprocessor define for the part that differed in the two old lines: The const qualifier. Signed-off-by: Andreas Rheinhardt --- libavcodec/allcodecs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 0b15b59364..a68bbd413e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -766,10 +766,11 @@ extern const AVCodec ff_libx262_encoder; #if CONFIG_LIBX264_ENCODER #include #if X264_BUILD < 153 -extern AVCodec ff_libx264_encoder; +#define X264_CONST #else -extern const AVCodec ff_libx264_encoder; +#define X264_CONST const #endif +extern X264_CONST AVCodec ff_libx264_encoder; #endif extern const AVCodec ff_libx264rgb_encoder; extern AVCodec ff_libx265_encoder;