From patchwork Sun Jul 31 09:41:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1872445pzb; Sun, 31 Jul 2022 02:41:40 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tGy0eIxdEM5WvmhkeV1Ah7MdWMZsKZ5FgyPqD+cB6S8p5IjgdBGbR21XgIsHF8+HgquI33 X-Received: by 2002:aa7:dc12:0:b0:43b:5d77:f0b with SMTP id b18-20020aa7dc12000000b0043b5d770f0bmr10982356edu.37.1659260500098; Sun, 31 Jul 2022 02:41:40 -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 bs1-20020a056402304100b0043ab49628b2si7159533edb.586.2022.07.31.02.41.39; Sun, 31 Jul 2022 02:41:40 -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=F0mHHiNr; 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 E176B68BA5A; Sun, 31 Jul 2022 12:41:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075032.outbound.protection.outlook.com [40.92.75.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF05F68B7E8 for ; Sun, 31 Jul 2022 12:41:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JvrX5WzTG687F60FXm6f2u9aqBhmqJffXOIpQOpwe0KOhe2XoBLKpOs7XwbHIj6HQgBxGApTjmWcRDJfj/uvzG8ImeK/h03m5gSjJx0yz/LCSHJjJoNEbP83/120y4zjcpMeZs6ralzeba41Nx9lxzOrNnIcZnJyKMvAeTPGU6kKD/9w+aaRMtol7HeV9qPTk1Q+r26+8Mq9SFsYD9LfLtrUYIvb7GUWC0WCyW4K8v8JG3xF/gIqox+YE86e1LZ+jazkdsmM9U3WXHzqM1FM4/mdKIZmDxj1sy5CdeJ3f8FvlheH+RycCHczWPmQAiGQEl8S+SasPO6/X/NuydhoPg== 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=/OTwsHcaRDXNU4JVEw6HfKn2sFw7JzFg1zOqS5C9uqM=; b=e/15Gda+/n0+syMBuEpgsO2Zm9qKfk/DVRblivIs6cbi72ndWbNUT+796/lzaS0+f7OhO3zB0dSGMCxy698Ng1VZc8l3kisNrRcKA+Y+JQ/p89noBqvDdKwNKJXVX5ooUiG231LRsvtAZae5kbDpSmGBmTg1sr5Gp1xO5As/oOI6uJJf8/+Hfe1hOy/CZXDZWPuHWOfozdLfRmJWuajtKgOuvAob5Tycj3RfFUJ97xDg5mVgbPFQz0r570qtAMlrzvgmLaDGVjDDkc3EArSlr0dvvkKBAUesrYQVyEhpQzw/Xe8Gbg7iDT9ihDTZiFSN1ObaJF61fIiHAtuMOT2i9w== 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=/OTwsHcaRDXNU4JVEw6HfKn2sFw7JzFg1zOqS5C9uqM=; b=F0mHHiNrFrrJMbe+lgQgrsYaDdQM3ghEJnCizMHwc84/xNAmIjHdMQ4ASKHV8e3cq7Suc1SYKzNBAq/Gm55ca8/HAUfNPyM8vI8su2YAvujej9nwEnN2ElTI5pOhCBevK4ZaHX8901rhUTD2jvVq0yDZXOoEYLEF3NEPakZP3R7l7jvVq/xbWWQ18DnZxVeK88MRm7bFfGbc++TnR/W6abDmdEvJ7MyovUIAZHGPMbwLQarqLbaF3t86KudDRMw5ohJlFfKhxJ+vAPMvwfwnRNHv82lnobfJEFXNIPJzIxSc83giNPZa5D0wygee2Q7by0QBZ8XhZ1ZrnEvmCQyGKg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR01MB4574.eurprd01.prod.exchangelabs.com (2603:10a6:803:a4::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.10; Sun, 31 Jul 2022 09:41:28 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5482.014; Sun, 31 Jul 2022 09:41:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Jul 2022 11:41:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [VpWn8zYujkx+aMpW21ZjzEpDgZ2od2pw] X-ClientProxiedBy: ZR0P278CA0035.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::22) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220731094119.1701898-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f3c89df-20dd-4ae5-faca-08da72d8d725 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuFCxnN2zLh7GI9xglPlSCD9v2C3/u/jVErlcIILzjvJeLZmGTpEP8c24rEr7kXwyfY9i5B6uAEP7hzDefVeEDaiMR8GH+BIdvR5J37y1FdEuoeLDlPzKa6d6DI3kBVkIgnDjgbv2bWSJFa/V4aNYeHZwR8X8WoV7FvWJTUNIFsgJup1cwoDHgP/J8ohcHxKDc5T4NAyNJcVs39RdjaNMWciTKhEGyGu5t+VcMpmbbpFJ+IO0lnBDedR1/ZF1d8Q/HyIO4ebcG3sECz+gV6Q1U+PrL7kG1PDy28q8S/FzWzIOqN4hw8IS9zoyNZeLdOETDFumKEj2+a+gWt2ZdCSPNBgbZtyoi+1LTfP92iI+rB17e5sOXrlsZmQKFTKNDEXeG+kosrpkAXqoT9hW29tIA1WfP56QZkQgU2tiw05J6U9OTp0iO9cBzTTWzvdcZ29rpUDcm5wRhGEl0zga1NwfY96qWLe4zh3cAihvL5bDZ9OQZIp8Xg8VFbwoVPOLtPx1ES8ZMjd5qjhJp2rOjaS+HyanXdnMYDUqLvRp6PdvSIcUnlHuIg+ic6YPjQwAlHbrRc783oaGh91bL4H6AgcfCjE9GEJ1Vgdk/UjGmchhRUifNI/ReWjYsFxdJTLntncqEIbdoVDAZ/+Pkozdp2Gb18M7cxgNu69Vt7SOWhuTvAYYpTh7HQ2Gqt8arhXqbEjIC7d8gx9hm0gmBdu4fC9NCz9EQQ8KJj2sc0xm3WRl/SdekNzLAUnHEyCk6CIxnrVsoPAO0tdLH9mOj2niIj5Ia5 X-MS-TrafficTypeDiagnostic: VI1PR01MB4574:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vfgu5wQ94axwcuHcnIan83vF2jG2gtAtXLyFE1lDpeppwTyBrMbPKTPQOpuKN57MazD+ImHSGNhhwLAPPDVnThNnujtMmbXJPnhqGxhWM+2sya2zcSCRZY2sXuumCT0r+26t1xTUeCRrwY6sUtv2Ei1NC3udrftIHTvvcsJWA9S4WHJuOo/knFK+LhLEFSksotn7N6p3ikw+ereYWqm3FIUho9QUaLj2GrNqyvLdw8q0vczJJ1/o9HShZOZacusKvRQ4S71p8VtJCAYeakGIuRtL0H9auq1VOx7k7dZGMi0IdER/CzrriDT4/CYa4q1MS7Qv3Jm/qg7fe2fhOKA7z/x3Ckwf1vpRuOeaclGre+JwJQxTOdKPBsCLnAq7alXvB5SXnYq9fWH8fUE/1z2hBgxfLMIhnu+MNmCT4Dq9wLhC03uk3+lX3rprsTWruzyaAh3FO8z1J45gWYjSs4/yONsF9/xM7w7pMJTrq+/bQUznAFY4YNwpMuGiwnt5HGOX/FNqXUtI9Tn6HjvpLi4YZP4jZJn3m2mZcoljS5IUq6ygVCm5Fdski8UbO+Ykvp7Cidbyey0ff1NYx+5Bpm2LgDRvLzxHTvSHYOggeOcHvlxEAODqynp8MQGXI9KpeOqaplXmp+NfkWhjURuH30L2xg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4nf5zuvQ/UuNQ05sHVTMe0C07KN2nLoo/KV0L3llFpEIU7TW7cO9i1FVmTrlf0gKOaJhHChTsYLT2F00AktLQIcJMNemrDHMfPwGk3jtZKOdn2Pn9gTYsan2R+MNI10Ag6melveKCfItmcFMgSWFAxjQ8dFKv1rwhjGWADI+Fv3GqcWo0oZe5LZeQjUdHf08mwcoL8dQKnYpbZJIjC7NYw4PpCtPHnk6pIMNdtFEXfvOiwfSzzJNM29IX6bs7xe8GslTveoX5KdkTNaOLCxSnm4Tfw8v620lyWPKk22dnaS14caFhlBVSb21ZYIzuwjcN/X2f/+AaJPe+lMVK3ob4sBeGJB5uVJbu6woYDsWXqMViMdnw9yiPTuHUcjSeRp3wzEAVsoVn9zxhwsq/Vy3U5NkEAql8yS9+kJu57OoFxN8wI+PsfUQYepdhpbV29G2efxne+ZgYgWfQNfvVUbKpF69l8JZKF1J3p244Jbsj7/EBSQMHKn9E0PTdICAKt0wOrKKcDcqN3ViIn2O388l3CT1w6yFysuU1Kfg/Xw1R9rjehsAnYpCkCJPaNz2rQTXH5KrxFce0CLo/+0Qklz5mGeKZx8HO0GKAAjAWGR5QMREW8JKz+Ofuw+zeBOYWhEEQmZVHXjBFhyE8yzfxhsdSa8DnqOKrgZvE+An4n1cCoy+9fi0pmLj/JFgKrEA1daVRQDLn3mBX1p2Y2bMPl820yXAJCUpnAweSwqcSKFpTz8XPqcbkjbq6pzYoc6XgsoRAjBj51fEmgcmNi/BRiFrGfUrNYhjZvI/zH8HPQMNRAxp2yUa8ixc3dx0yM38tdVDuZQ64g35Gzs6K6k/njBqJikfVUxkeXj8SwQM3i+8BQsdOz4JuCrxXmzG5o67bjUFUxhGZGHEDt2kM2k/xWfdOoysmOWrLj4bP82iynmK1ByL+owsJ9MIpU8qfrBZyI4hlD3Pi5ul3H3HsYd29VUL5LAS2Qo8qZDNdg1TKBlkxPBhqeOIbC0CIRCmv7i9xybhAZKxXRwnyzjFh0/pBlnSXbThR9XbHtHXiK51UzTJqBWHvbvR26Vf4s0cAbxT8mNXSrrNw9BelFP2I80ViS6iyaGJ11IKkJDaVkimBeknKGCoz3GDtKP5CV5VL1iPxL4ptTxLXNIeST+aRaFRXUZlQg9dIoCvMcj2CNy8Fq4M4ar+SN/gnr/6wS+l6MA0g58F3c8eAXf2HYnLjxsVuR370beRy/xKnbsv6kA2M0qFSiAQ1Zsilro47FQaL9451DizoxD4E7pqjVYAzHn/qrFObP2zkRTeblCpK9wyZIPnraQ= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f3c89df-20dd-4ae5-faca-08da72d8d725 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2022 09:41:27.6939 (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: VI1PR01MB4574 Subject: [FFmpeg-devel] [PATCH 2/4] configure, avcodec/Makefile: Make IntraX8 select WMV2DSP, fix MIPS build 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: xYn+RWkmV0s5 IntraX8 uses WMV2DSP directly, so it should have a direct dependency on it. Also remove the indirect Makefile dependency of the VC-1 decoder on wmv2dsp.o. Notice that since the addition of the MIPS WMV2DSP implementation building only the VC-1 decoder would fail, because no Makefile dependency VC1->wmv2dsp_init_mips.o has been added. This is of course fixed by this commit. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 974768a663..ff075fb950 100755 --- a/configure +++ b/configure @@ -2733,7 +2733,7 @@ h264dsp_select="startcode" hevcparse_select="atsc_a53 golomb" frame_thread_encoder_deps="encoders threads" inflate_wrapper_deps="zlib" -intrax8_select="blockdsp" +intrax8_select="blockdsp wmv2dsp" iso_media_select="mpeg4audio" mdct_select="fft" mdct15_select="fft" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index aff7752856..a6311411d3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -723,7 +723,7 @@ OBJS-$(CONFIG_VBLE_DECODER) += vble.o OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o \ vc1_mc.o vc1_pred.o vc1.o vc1data.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o \ - wmv2dsp.o wmv2data.o + wmv2data.o OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VC1_MMAL_DECODER) += mmaldec.o OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec.o