From patchwork Wed Jan 5 04:03:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33077 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp384353iog; Tue, 4 Jan 2022 20:03:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1kf9x3+BmGRzhnXdZTdiDHNN1ImWyLwzyHWmXNHeMmAXhmYNbq5ZFIkqRLTCpTH/1jTBk X-Received: by 2002:a05:6402:22f8:: with SMTP id dn24mr49860357edb.357.1641355416707; Tue, 04 Jan 2022 20:03:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m13si15308632edq.512.2022.01.04.20.03.36; Tue, 04 Jan 2022 20:03:36 -0800 (PST) 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=gVcg19RT; 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 8CF8868A76A; Wed, 5 Jan 2022 06:03:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075087.outbound.protection.outlook.com [40.92.75.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A9C768A255 for ; Wed, 5 Jan 2022 06:03:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZbtkYQFDjhzzkQeJT1u6oWPW8gvXpIB1vFzuDCAl2yH4k4fKVM2iFsYZlJ4v3JPR7Yg+6FY+8wIHa0d5hTra+HgHYiYKKM3toJawynZWjZO6+8B/dzucGYkPmnoX8DU5i9xfuKUvUQc/xJntQJJV1IFMwIUnWav6Iv8JqSijLzbfijHgZ9bbQ5RMwlTJvOYwgp9zJ+3NA6q4on0c7FV2XgXZHLDcxny3+iQZz88NI1lhToU9gc/qo6MlMzauqbPDca3UxF2JutPXKXGAJDCdD9f9m3d3BgmP/wpEiL27vxqve3KJ9nNGH5ScqfJf+g8guU+HaHRludqjLXNJfozyzg== 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=Ez6EY6Ha8sqS2f5mNKlwj6QyueMbpc5/k6nP/rxn2hQ=; b=HRnz1uTcSa5dDjHc/rqr6CiCSwHSTTMbzbwf62vRm4165Qx1+YLucn88EGdSGgpciKBZMDXNvQYaxa+KCGx3lKj3bwO5KLxvM7dvi5EKr7YmaZ1TJXv2ZDz5VWU97TG6i3T2kFtS5vMycSqIoMXfIAg1k0K3Om2B+wsJ5p5XCGG12fP6BmLAFGGeAF+kNiRTDNBpRLWmrJK5XDsW/Gr+Lw5BBztTgrJamRPTFFQ3vjvwaFX/0xWBPHiQVxj6lx44y1+6VvvTYOyK6luYOq56ko8bQqm6uObmir+XVqwnVYf/8UYdJPXQD/I+td08+fEG4ujAZPSAsKtNyYDa+gHrvA== 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=Ez6EY6Ha8sqS2f5mNKlwj6QyueMbpc5/k6nP/rxn2hQ=; b=gVcg19RTEWDWLyJPuHkVRgerX7sH2l5elrY5sENzzNH7ozFQcA0mmyYOUiWAs+dsoFT77VCMgQGvf/En4N4jcrJAelTXwCQdd+6Z69KukmFzfFGIgRIm3NmRie+E2LdMcZIRxGLj71ji1OU106uaVMCimJkKNcl5pysKPws+SVxdkPWScjzV//cm2EUDMWpaEk7MzaN1f/C1BseAmSJNU5Yn72CqOkN+QmpL9k7Sqrcmu26QLCSE5koGglgdZBvs/GtMdveJdC52klfyJhDjLTzoZpfzUy6QBd/KVSd6vhNF+sNnpjUBtOLSHWB/i2/ZZ2++3fdGYuKEr9QPx/LUbw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6627.eurprd03.prod.outlook.com (2603:10a6:20b:1be::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.16; Wed, 5 Jan 2022 04:03:24 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.007; Wed, 5 Jan 2022 04:03:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 05:03:15 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [+2yoP7pzRFQyMC3r7dJYGGJLRbOrNm0j] X-ClientProxiedBy: AM6P192CA0089.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105040315.2072135-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8852e413-260e-4186-2611-08d9d00051f6 X-MS-Exchange-SLBlob-MailProps: mBy7Mai7yE7XslK7bZcxa4QuPIE1dPvkD+3v/3kdEL58WzoGjpu2qhIXfKMmMyfwyWNcZfR+go2+G+ze3QMt1Ej5ufwiqJn06tTc/XeKk5H6F4IiI5xEvbhlLelJextqLBbEH5dbmYqhTCfCMk7sBb+8CKlz9Y2H8817WobbyBx/gDdfciLh89RRySeIPatGN4NrAzbN8JhHC+xg2VAe+N9Z8NSeDOiE0UaiYraOVQprtByr3EnOanijzTVfKfJJ9dp8O9kN6VPE1QutCuO9VnRfV962OdLgtuH6l7a5x/udpJ++LkNRWNYc+uWdK4nlqmYRPNEm+8NTbm+EpGWNvEGYrZ85SSSUEIsNk5ogBTBRJPamFZ3nAYANvXBPaDodQM0761l6S6GsldmiXIqVxxqrhhlfgaSjRLYimCjTlsmNClItpnqr/WVPxWuVhHXb9kzGl66WJoq3xjdu13JpXLyGCrsyho6iHx+N7QU0YGQCJatHtvsJ86U3cUG1kaOeWAa0batP/6DajTb85Ckyq0rRa3Pjx3ugX0XLDrG6B/MPdpTogPSsWJbmm1pV4XM+0Zkvw+iHb7xUgR6OP6JcuoD1hBp87h4sIRGkveRsAqs24vHSX/LxszggOkpTB3zswRZcC7veQ2dVBWzaHne1NK6zu0qHNkJVmPVTp6pv3oulZ6yk3VwJnIY8kvgek8i7DybrvyOGcfA1RBcFpPHt+aXqZQr+gNzV X-MS-TrafficTypeDiagnostic: AM7PR03MB6627:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /+hUNRqV9rp+RRJi0bLGedBM1qgrDT3uD3D5ek7jz59u4nqJ4SerNtJ7mfemRioBh3uFABYEeI968T/zVFTfS1WgHVDRKjnl//KDIcr59C9o0sA8b88LZnjFrnMZSa71yrrAzP8wPtzjo0deKFWSJno5WPfyZPuqQRu8NWnitGixjdZ4b4qxMk0/mhLBHIceCnBxp00ko4KM3M3xnij4kpZn8AwHQ+8UaWO544E5ANhZf2iuV5FZZDieXTyp9pbj+RV1WXp6eNTK0dPRAfzNMOscNnId/vcTqKciJ/DQcV5qfGfmw7DK/IHmRT9Cv9MS42V2LzJfXENXPdJbFLZYI2iUuZCwv2eLf/9hH3JUEI2oFwQCrHabHNnQRvAr3TkgQNCXJCOmi3DujBWDaPLdWtv4Qk/T1Wh2KuvKvGi6+Yt+vT/jA9fxeE5PP/i0eggsDMn9YjwFaPL+KZnfgVqvjPAnfW/Wpc7Bu+8Knl71avhBwdi4yddk0LhDJTYO9tb73qTAsT7SqivtAOY0966CJJ+VFP7i6A8ztzw58EjtHJRenKaRnDv5CBNEJBY4Il/MrQB3VwOagmIGoKa3fmY6rQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CJH7jizQaOvV1a0ZUmTb9ONs3xzSssGCxZ05EgfcDCY9tSM0ton+LuXy7Frallbt4Ccda9DLcb1h3wWIu4Jqz0WCwBHqHW2A1Ywgop53a90L2ELY3MfC3I4WIm6R2rvy8F6I/Z9ECqcxE9LSf4Ckh7HJCLIy3vPE58sKb1f1euhnVaHU1MilgTyzcjQz73qYufD5biselbpP5KaC1b2twUcX0BGW/mlSG1uAr82EbfhLX5ZBg2khTdS1RAfsvG5iehmImpErCZn+/nSgbRY6jLv/KJVVG9SIkbRSqakiC31Wc0ua8VvH3DdOU6SqtMQ2IjIO8eIs80UjDuYFQ9sgSp8R7Q1ynNvHkVeDPhyV2RkIVsbJjl8wlX0KrlBS2v4YUq3ASBScRN3CA0CMkAk4o8Hy/evOiH8M9hJajtBQTTnxtga36kC1MaucSr5a9NawZq1Dt5CQE2Loa7tE9uH/WUumMsebo5UyT10xChndpUpmFLSPJNU3PQqf2QPxFq1N5Jq4irgmw+7EUbbutEiXUnLA9rW0xxK/NNOYPCNZkdFJCUfJEQ+1qlmu1B+WPS/cHehBAnY/uaxZJnW+iMayzHq3VENZfW70GbHjz/B8AXeTasLwz+c20Zli1pbMEEFVH+cAyWDyOp5+ZkQnj3NAyqTfnj+IublqluKrLBY6PQ7P1JVxCBRI13Od3I3fsq0sXUaTCutI6fcexXPKXnKo4HFubBl52Gg2Nmo58BDp1pxjKWBGy+wropN5qZYNQdIHpTLbo3lbUqPumOhbgdu25fsOUCWiYt/Jg26ckF79kPizAztQqHhH7LiD1cZFVnE/ltvYATSz2VmMQCkPS5NsitIc6j1hWk+Eh69LtC1IFJhvCIsIFxmGBh3kDUC/3H+ROTnBJenmmKXBMxyGGUUvtcJmglIQLb5ZsB+NMpir11RCHW96Cr61fJXlOOD4e/JsZCiduSR2MMLs3B5oecEn7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8852e413-260e-4186-2611-08d9d00051f6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 04:03:24.5499 (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: AM7PR03MB6627 Subject: [FFmpeg-devel] [PATCH] avcodec/Makefile: Add missing mpegaudiodata.o dependency to MPEGAUDIO 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: Zane van Iperen , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TxmbFBfXaeaw Before 33e6d57f01dd4742a2e25ac5fa072b487d9d02ce all mpegaudio-decoders had an indirect mpegaudiodata dependency via mpegaudioheader, yet now the latter only needs (and therefore provides) mpegaudiotabs. Given that mpegaudiodec_template.c uses stuff from mpegaudiodata, it should always have had a direct dependency, yet hadn't. This commit adds this missing dependency. (Sorry for not having checked indirect dependencies.) Found-by: Zane van Iperen Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7dc4ccb85f..242b48ff7c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -118,7 +118,8 @@ OBJS-$(CONFIG_MDCT) += mdct_float.o mdct_fixed_32.o OBJS-$(CONFIG_ME_CMP) += me_cmp.o OBJS-$(CONFIG_MEDIACODEC) += mediacodecdec_common.o mediacodec_surface.o mediacodec_wrapper.o mediacodec_sw_buffer.o OBJS-$(CONFIG_MPEG_ER) += mpeg_er.o -OBJS-$(CONFIG_MPEGAUDIO) += mpegaudio.o mpegaudiodec_common.o +OBJS-$(CONFIG_MPEGAUDIO) += mpegaudio.o mpegaudiodec_common.o \ + mpegaudiodata.o OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ mpegaudiodsp_data.o \ mpegaudiodsp_fixed.o \