From patchwork Thu Jun 17 02:31:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28432 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp201022iol; Wed, 16 Jun 2021 19:35:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1uCmvRJvboaGQk5XIb2+oqrNkV35wJmr5xFYmwYjgqYCtaqQl4E6Ted2K8+um0H/VS623 X-Received: by 2002:aa7:c1da:: with SMTP id d26mr3398255edp.92.1623897338256; Wed, 16 Jun 2021 19:35:38 -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 j29si4215136ejo.664.2021.06.16.19.35.38; Wed, 16 Jun 2021 19:35:38 -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=cwPF9SCO; 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 3A9D6689CDD; Thu, 17 Jun 2021 05:33:32 +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-oln040092075067.outbound.protection.outlook.com [40.92.75.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB1FD6891F1 for ; Thu, 17 Jun 2021 05:33:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q1Ke0uACGbtmvyRZdOgr8ZAvTbC03PLescxH4ABpcg+drYZalSSEOVldq9jEkqYAXea7AC3e2fFEe6KwoUevZsJgSgDagcRvBa3zMMbQp/6Lpw7ALNoKYgbEVt12ad3OWUPpq8lJN5bgEDjlkD1cMJI1JYMAS8b6o0VOIVXx1/NjieQ+ph9FjGk2fQQe2sNYVSsvLPXaRu3Cb8pZM26dZF0pqGOC2FlXYhOaZlBqzy1zLUn2DMXKker4AvztZZZM6aAxfs1a0GuuJssU5gYRc3OLVP2ctLkjJndRGw7VEBDzhjuCXjDoetACMEFlwty4n0EO52VtOAkK2MCVg2mscQ== 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=E/hKSsA6+IT9jF+ivPG8wS7ONZV5Mo2Ro7AJhcckOFE=; b=XnsbFxwwt4Fa04hQIJMek9ku2e4eQmG2T+7OuILvPpiSPoZ9dsqQWSLRTb385uuTvSbPJV9BOXxahhkXMnxmvJQTociOVA2zcc8+a+w/PbwDkou5ddf5L9V1Y+xFu13+vJ5O0i3oJDwdy4b62i4KdWkUHztZEzCQsHQaZyvBhUEmcFmWroTmjDWe4D/0hl42xe9jhb4k2dKbhPHu8FFksnaeGlcweMNI2jg3AXajJeL7s0SzzedMihVbxib6Dhj+5vmBRA2amHnb4RPC/KN/hjsEZ0klzTrkOlesYCgOUEfIZZuK3AZtUaontuihxEB+bqAhOTxrAbSx0v7XsjD8ww== 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=E/hKSsA6+IT9jF+ivPG8wS7ONZV5Mo2Ro7AJhcckOFE=; b=cwPF9SCOc3KVAd0kjlYCefsl3M2Bf5vonrnnIBCFwafOPlmIrBNYbycroo2tdyL/vo9GIxgtIc2/QWRhzY0ctWpM11rRjPZkXuwzPdnAzg4LFZ/fmqor5hwDEiIWQKSb4MQyUebL9B2BfWx7szIRGzzSRJbnmCYszkCoK2azTaRJ44YrFnvKQdZibXqcN3kK0AGgGETWrl73901JmqJOjXdDxKaCAeW9mwPzNK2o2QNj7M4iv41eue6+AxxFj/CVUKwCqOapO2UnHf36H7Ow9yXa+Jm8IIGuLzZC533Rs6o/exKhqRMqzsdueOhM5xHPXqSl1DRiJ8C8tIa8qrCl4w== Received: from HE1EUR04FT016.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::4d) by HE1EUR04HT233.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::418) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Thu, 17 Jun 2021 02:33:19 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::46) by HE1EUR04FT016.mail.protection.outlook.com (2a01:111:e400:7e0d::93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:19 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:21B16FC544A8BDBE1CB386933165C27DF38B4A2368A947AC99F6171B2036CD85; UpperCasedChecksum:B6839F835CFE285F2ED11ECC16CF8370C8A5789006745F5125417750AD87AD60; SizeAsReceived:7602; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4242.019; Thu, 17 Jun 2021 02:33:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:42 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [/X04CES8X8CrWkovi+P7COqUIjTlUtat] X-ClientProxiedBy: AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210617023202.1318312-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:18 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ed398bb6-0159-4f60-0e50-08d9313844bd X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuqjb86iTW3gk5Jbr2ZJA1OKuf1rAMrvrfWrqbysqoE0b0ooN3vPfMoFtf9PGDT1ULKLKD65NCgIuYA3MsrJo6L/KF4/GymCE8VSVM+G7quvOpcyYe7MeyYQNonP9BPBLBcPePJ3SWtYQakQ3jvYn06lX0S/MU9gWhKM7O7cB6rXzzPJSBL2X//y0BDdF+RqDSc3zs7r4jMx+Nc6U1PNWUMO2AjXU25nB/y2AFPevr89GwfjQ/A7pvdHn3+FAS4qhxfdPDD4hIdTc5T+bukgzFvI99/i/zlzef6G7J74OJc/8NlYM5fSM3AHw/YCmcb5uBQPQYf6zgKfgaUHBbheCukQyyHsi5Il1XwC6wdAkjmbglw/FFc0A23izfHLOW+K55o5gr7X7fxQ3DkSqQdx9SIcKj0WTaLs06fyfLjEr+mkHaafQBOcAhim1fEUidda3XJIb1Vwuth84PN764zDh/J0CtqPB9gBbB1jZAukhaW08jGbNVoEMJvA0PIeiFpyJfzw/+6GVnCjUW2MsvmoumHSQD7MD9D0HkiNnuGnIzutQQaZJVdUrFYTEuT+aLELHcIwk7oIQwoRuyZ9xEcFNNBQzSLMj4TEq8APKPZP7L7BmiOp60kEjHSvX+94itPaJ6cnBftMxFkHejPGjoAeY8eGHEXV2TtluC99etOXF01i0YjwW58NMuHk2OGB5xjrHOUGtmhSHMaGddEaSXoy44oWoABzWG3QgHYJZ3MwtuhCK7s+l4gjCGeu4j+knMB5oWy2mL6wRyuDfU5IT1qzNnx X-MS-TrafficTypeDiagnostic: HE1EUR04HT233: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mkQihXzwBh6yAXZtpOzdE7pmAdpUWwTBmwt6dUMd4t8Q5TUwQ9jaIXBa+5qu5SAV25rryXuEnO66m84DRWg0PbalvjsnGm9bV5EJUuaFSAYK6IDEcbJbi8F0rZhsXnHGPV1KopW0K9QeaVYaaR/IMIppP7eFX0gebmZpeweq5WhnG2R5KOXnUio20LXBLf1+t5TtaBNtEpVEzco3SUzfMP6VyzMFUXP28UZbfOqBJNmneZLmquZzp4i/aY0GCWwNZSiMoH1vGYZpZ67PB0nQM9pqcVQsCzDgX1hrQOpMMSHKamu8hib0tT7vAmx92WMtytNgKaoRi88Qe2ZSaIuePk77DUny72UrztdAUhsC+mcTSkWhvZ4iRJ6pL4R5sKYWpu2ug8Tb0dthmAPCzUZdag== X-MS-Exchange-AntiSpam-MessageData: kfidhswJqRjEpFpA7lSLyJAE46UOTw4N/aMDULkd85xkdrNh4qj+xTmAeWuwAeQYJY5o3nPhVNXQTcjvAnC95wYZTZMwQMVkdYJSlBGmcRF+Oc7/abAGlEv6WeVvCEFz6yQ1N5qH+A4q4B00WaG9DA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed398bb6-0159-4f60-0e50-08d9313844bd X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:19.3225 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT016.eop-eur04.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: HE1EUR04HT233 Subject: [FFmpeg-devel] [PATCH 21/41] avcodec/Makefile: Fix standalone build of adpcm_argo encoder 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: LIn+tyimU3gR Said encoder uses a function in adpcm.c and while it does not use anything from adpcm_data.c, other parts of both adpcm.c and adpcmenc.c need it, so adpcm_data.c needs to be enabled anyway. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 04f28c6c1c..be64c82c66 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -854,7 +854,7 @@ OBJS-$(CONFIG_ADPCM_AFC_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_AGM_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_AICA_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_ARGO_DECODER) += adpcm.o adpcm_data.o -OBJS-$(CONFIG_ADPCM_ARGO_ENCODER) += adpcm.o adpcmenc.o +OBJS-$(CONFIG_ADPCM_ARGO_ENCODER) += adpcm.o adpcm_data.o adpcmenc.o OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_DTK_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.o adpcm_data.o