From patchwork Wed Dec 15 12:35:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32526 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp8176180iog; Wed, 15 Dec 2021 04:36:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJywLIe95/93OPi323wzdxBfcRAk25jZ0uA4WGOb/GccjUfHl8KWP1SWg4BH8RZb65iOkr7Z X-Received: by 2002:a50:9d48:: with SMTP id j8mr13969381edk.192.1639571808697; Wed, 15 Dec 2021 04:36:48 -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 jz15si1098780ejb.106.2021.12.15.04.36.48; Wed, 15 Dec 2021 04:36:48 -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=A8UCke2F; 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 19FE868B0EE; Wed, 15 Dec 2021 14:36:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067080.outbound.protection.outlook.com [40.92.67.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7370368B0D8 for ; Wed, 15 Dec 2021 14:36:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YXoVongDemZgXdf/TnWjnMrDXq0cUYFfIcA50Wz1gR+VgIezF5YO7a0jdvouPi5/eSCoRPW4x5siNRECl/9AmzMQ3hIjpNdPaQ5kx9x64eYLtz4vQiSlFfIG/A8JBLdfUkcFIwrwtsAHCWw2BYKoUh+GHrodOYu3p2RCo37pOV7GPdCFz9yjStqPw9kEVSiTm7RgEuSd5LujOgdpgYAGmmF7PyGGYZkGQHZfbdBWV5uFoDO2RBWiZHqdwo8thVJbW4tZVuzvWnoS6nXISHEg44gTHQWuOewL+ACOkUZc2alqQVSvaonpINfcVP8c3VqnKozxUtEavE2Qms+OzZnRJQ== 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=pC8LV+U9rZSa4pUBfW0oXFogsbGL4HxZas0eZMpu1ro=; b=ij25SDpaWQ45dWjQ+xwlulfrCSqDh9dgfVmmodjcIK5lB8FZe2T98sEfX1u7oJ0oSXHQe+bZaigTPKmNy/YstnKfm+TNn2Bqrfebn6DaUB+8seyXMM0SVVR3WTEMNM2/jD4MRl+MzjlrQh8Q8CnhcyDiRl+Po65mbIIcvSQ88NtKhGOWKlJxnCn9B0g7I8oSTG/uZAT6D/Ld+J6YprfxpWET4gJJINiSWuXqmqr8/y0nGsLOkHZZlrH4A4l0/zYJ24txQduif8EEauivX/NIe5cshhE4dCsEgIYDYF06im4ENNrAjcHvP1olObu1+gb8qvLYQiOaPP/LQuEST72rtw== 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=pC8LV+U9rZSa4pUBfW0oXFogsbGL4HxZas0eZMpu1ro=; b=A8UCke2FQ2OEaAeUgPXCQGLrUZ44cmS6K4ybJKKr6Q+kexZDOjnnkRkN88DiiObs/jpQMfjCyNWrJ6ecSJ4iX3qtP+YeCwVlS2h9ELIhzWGXgpJcfY9BHromqMVm0oiH6TvHD1avKz4oPTLOhRos2EFnh8aWEDI6CCsWVkw5f6qbe3/ra1Fzw7SHYOqm6hO5CxGtyh5MQdpr3v5bVP2QvlX8WUNZTf0X5BjAICfwv+49SLwVYv/UD/u5hfbg4dnrijz7aogZ7Ml92KP2bfjEY7hYvItze9ZtDxUcAbtsgLBWJhb8YABKcBn8B/aAeMGITpzqrXn1cjYXJRX9nPBrPg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4952.eurprd03.prod.outlook.com (2603:10a6:20b:8a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Wed, 15 Dec 2021 12:35:59 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.018; Wed, 15 Dec 2021 12:35:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Dec 2021 13:35:37 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [IPCwgDIXArvrYQh8IBEPzNjSlNUdQYUo] X-ClientProxiedBy: AM0PR08CA0014.eurprd08.prod.outlook.com (2603:10a6:208:d2::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211215123541.5406-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a71bdef2-1d95-49ad-3dfe-08d9bfc7729e X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybf2IByYiF1NV6hxzpVIWmo7V1o1HsfwzdItoOS7jZA2ClctcWZBNM/S1aTYC3CMCxu/HJeYtGst3VtSeowmqKl7zhr1p0Z0WxSAX71DZ8iHRRcY10GWbUz3CLSomENoaqHs4OrOfWwlFj82FR7qXrUd+PdlVG2U0Ew5/zaw5ZqVoFnHQx8Lf3qo8iXI2TB+Are5SBhOaTHRvLKxRq1FWDMmJdfTLAd/oFYE83o9AUhk+ulYP0xWXI8XhI/h8mJAs1/KP93rA2MyVCDffgbOFBdBV4ppJkd9IMHr/WzX8ceIlmFhtmzZfsCkGPiBOHQjMQMlYSkl5uwthQbmmo5N9rpFPtT92ZCo3nRRcDIAyDJfiWPZXynDThnHel7G/ENwp1a8KJyh2ahkyd/iY0xq/yT72DVEpxXMKiDag1lr6YF8D+DuZynBOltLfk2guS+53g+s2PbHRleUghXPbWb6MnW82DVmaazocSl1leMeq0tJYt1/F8nFru4NFxf3depZKJNRCuXMrmmLcrCJ/vNl/8HUcOCxhagKfAkxGOZ8mX09K5iZ/UbmqHcAV2qi/z0B2bd3goTOrvK986761sdB8nviwcVTgg6AJDMStw9RFpnI36VyFjuu6z6Ua0Q+ifo42bKhiFudWj8KBGaSti9ZEfz1d9C+sj9exoWPsf/u71Bv4Vd+NwI+7rfiD7rKkvsfo/0EOKPapSpo5NO/OVtpWHeQJnBTtJEr7PvKqESvPLcrqGIK7KRSGHxrtxAa1H9NMf X-MS-TrafficTypeDiagnostic: AM6PR03MB4952:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qzF4dorbWqrCRQe++brcmWhy3718FkgLdL/AQrhvK6eOp+qNJfpzPQESyW3qy2XwlWDwgrLck0fGWH8ci4LEGDx+DeegnhK2JUlC5/0eVPJaDQkWkLFLE9PeH0pZd2UKmWVTobvdsIz0Sh9Cn7F1XIUNNSasdU4rGw3fM+EsXaYxqP+OPn2xpYRdVoU98hN6aBRlWZrwxU6PrJju7zZOGqPoQLYR74H4PoX4okNbp91B62uP3APnUK+lZ1Xe3Lmwv/kOA8O0oAJygjJYVL8EPUqcFX3afkOumnhJFklIgxsIeIiRrQ3R6nQKYOcItjTK1gWmfAXszZa6ei5PTOztnHzkCv6hZ60yvKDGFkpaRexY80u1FzFy9809f/M96+FdlGlqoLiMJUuUTzjKWm4MpCpt/RHZRez1vrTk3/ocS7cl7gc7p+o6bU9wlUYeXmv061lGs+C/9OPV2sqTErIxoK3UY8BM95vHRkvRxf8cfv1k3l3HCyoCbOlr/uTQ8e5a6AS+7uXCr5ebxdJVzbrGHEJu3p2e0snA5m4RO9Da4RCRO3YEzZQvAVVr32GQzhoKiozMNcr7Nem1C9rd7d6cGw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 95rRnu4wISX/D+BrE8/k2hrPh2+nzE/9BGgtybEjxUtehALaxNPzya+8bDp3maHPVjZ2WBaHE18VZ57y8tCmFSji3p5VKohYJ4kL/FnI9zGHmw+raAF7a5DYITi8qrMln0v2T57Xc/aXRluPt+DDMbHe3YhtATF7CQCpPhjSa16O2d5GLYXcP20tLFQXrCDVy3EjvbcpPBHD57SkgVG38lDxZ0l+ctqymHvjWwFpH0Xm3T9mRIanE2E6qTT8NOAfJP8XtL4Zxh3pYAblY/W9ux9auqtXa1sMePL03RVzV7GdYOHdMgppvWzrr59vbq+tJKvZiYWNSwX3G10ycNq+CIbpVMnTTYnO7dKwm5HHLsNVW1+5TUInetlGfRzSl7ap71EZpbR3fDILglpcQpvTitxWWtw0CK/BcgabPjgPA7GTvybI7R+klfE8CVvBkGHoz7v0gsGzMnOSHfzcpTDiaXrLez9+3Jm7q6c1oMN/4VefldSn+KAnEYos7tJTYeRVl4kkdlWaLuY3/xBblRZhMZMhKyL0+SbL1/mmZRYYQadsgPWksVZaIfMFuai7ZVGP9uaTlwRAppYb92B4h1s9e/Rfcnm5XgEdiDXAP8lkYhhhlMOqn4hC4FNmiC711mw6wzKxE2gKP9jtkKPfV80a/5NX2cJIH8gcGv3BrBzVkJgzXMZgJEJ7DvgLPxmfv3qZ6cce/J4lQ6U3EPCzK9Co8Vlt9U5RBsASaORdPl9nM6TzOuorFHT6GNLkC7oS6t0Z818Kcaba6Zw/3W20drsgI/q3J5+0UriXUmykY9em3EPDHy7tY036o79a3e7krSuHm5hVDPNtMTZSZazT7gJezb9FlmJ2f7X+3bKCC/jTP89DJOCKJ4QKg413wwImwjFrmlqMyyxv/ipEBzRAa8pn206IQBdc0YncwheMZANL8W/D7z2dRVG3kMJCO0LgDkTl+RKP1hhqLL+n3PQWilVlzg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a71bdef2-1d95-49ad-3dfe-08d9bfc7729e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 12:35:59.7473 (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: AM6PR03MB4952 Subject: [FFmpeg-devel] [PATCH 07/11] configure, avcodec/Makefile: Add new mpeg4audio CONFIG_EXTRA group 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: ZIIZ7sp+J3/3 This group is mainly for the users of *_mpeg4audio_get_config2(); it is not for those who only use avpriv_mpeg4audio_sample_rates. This is in preparation for splitting the latter into a file of its own; if there were no CONFIG_EXTRA group for *_mpeg4audio_get_config2() users, one would have to add a dependency to the new file for all these users on top of the existing dependency on mpeg4audio.o. Adding a new CONFIG_EXTRA group only takes effect after a reconfigure; so in order to force a reconfigure some unnecessary headers from libavdevice/alldevices.c have been removed. Signed-off-by: Andreas Rheinhardt --- configure | 23 +++++++++++++---------- libavcodec/Makefile | 23 +++++++++-------------- libavdevice/alldevices.c | 2 -- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/configure b/configure index b5888e845a..28e45b7e95 100755 --- a/configure +++ b/configure @@ -2467,6 +2467,7 @@ CONFIG_EXTRA=" mpegaudio mpegaudiodsp mpegaudioheader + mpeg4audio mpegvideo mpegvideoenc mss34dsp @@ -2704,6 +2705,7 @@ h264dsp_select="startcode" hevcparse_select="atsc_a53 golomb" frame_thread_encoder_deps="encoders threads" intrax8_select="blockdsp idctdsp" +iso_media_select="mpeg4audio" mdct_select="fft" mdct15_select="fft" me_cmp_select="fdctdsp idctdsp pixblockdsp" @@ -2716,8 +2718,8 @@ vc1dsp_select="h264chroma qpeldsp startcode" rdft_select="fft" # decoders / encoders -aac_decoder_select="adts_header mdct15 mdct sinewin" -aac_fixed_decoder_select="adts_header mdct" +aac_decoder_select="adts_header mdct15 mdct mpeg4audio sinewin" +aac_fixed_decoder_select="adts_header mdct mpeg4audio" aac_encoder_select="audio_frame_queue iirfilter lpc mdct sinewin" aac_latm_decoder_select="aac_decoder aac_latm_parser" ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert mdct" @@ -2729,7 +2731,7 @@ adpcm_g722_decoder_select="g722dsp" adpcm_g722_encoder_select="g722dsp" aic_decoder_select="golomb idctdsp" alac_encoder_select="lpc" -als_decoder_select="bswapdsp" +als_decoder_select="bswapdsp mpeg4audio" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" amv_decoder_select="sp5x_decoder exif" @@ -2849,8 +2851,8 @@ mp3_decoder_select="mpegaudio" mp3adu_decoder_select="mpegaudio" mp3adufloat_decoder_select="mpegaudio" mp3float_decoder_select="mpegaudio" -mp3on4_decoder_select="mpegaudio" -mp3on4float_decoder_select="mpegaudio" +mp3on4_decoder_select="mpegaudio mpeg4audio" +mp3on4float_decoder_select="mpegaudio mpeg4audio" mpc7_decoder_select="bswapdsp mpegaudiodsp" mpc8_decoder_select="mpegaudiodsp" mpegvideo_decoder_select="mpegvideo" @@ -3227,7 +3229,7 @@ wmv3_crystalhd_decoder_select="crystalhd" av1_qsv_decoder_select="qsvdec" # parsers -aac_parser_select="adts_header" +aac_parser_select="adts_header mpeg4audio" av1_parser_select="cbs_av1" h264_parser_select="atsc_a53 golomb h264dsp h264parse" hevc_parser_select="hevcparse" @@ -3237,7 +3239,7 @@ mpeg4video_parser_select="h263dsp mpegvideo qpeldsp" vc1_parser_select="vc1dsp" # bitstream_filters -aac_adtstoasc_bsf_select="adts_header" +aac_adtstoasc_bsf_select="adts_header mpeg4audio" av1_frame_merge_bsf_select="cbs_av1" av1_frame_split_bsf_select="cbs_av1" av1_metadata_bsf_select="cbs_av1" @@ -3370,6 +3372,7 @@ videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrame # demuxers / muxers ac3_demuxer_select="ac3_parser" act_demuxer_select="riffdec" +adts_muxer_select="mpeg4audio" aiff_muxer_select="iso_media" asf_demuxer_select="riffdec" asf_o_demuxer_select="riffdec" @@ -3403,11 +3406,11 @@ image2_brender_pix_demuxer_select="image2_demuxer" ipod_muxer_select="mov_muxer" ismv_muxer_select="mov_muxer" ivf_muxer_select="av1_metadata_bsf vp9_superframe_bsf" -latm_muxer_select="aac_adtstoasc_bsf" +latm_muxer_select="aac_adtstoasc_bsf mpeg4audio" matroska_audio_muxer_select="matroska_muxer" matroska_demuxer_select="riffdec" matroska_demuxer_suggest="bzlib lzo zlib" -matroska_muxer_select="riffenc vp9_superframe_bsf aac_adtstoasc_bsf" +matroska_muxer_select="mpeg4audio riffenc vp9_superframe_bsf aac_adtstoasc_bsf" mlp_demuxer_select="mlp_parser" mmf_muxer_select="riffenc" mov_demuxer_select="iso_media riffdec" @@ -3454,7 +3457,7 @@ w64_muxer_select="wav_muxer" wav_demuxer_select="riffdec" wav_muxer_select="riffenc" webm_chunk_muxer_select="webm_muxer" -webm_muxer_select="riffenc" +webm_muxer_select="mpeg4audio riffenc" webm_dash_manifest_demuxer_select="matroska_demuxer" wtv_demuxer_select="mpegts_demuxer riffdec" wtv_muxer_select="mpegts_muxer riffenc" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0b568138be..026b558d32 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -123,6 +123,7 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ mpegaudiodsp_fixed.o \ mpegaudiodsp_float.o OBJS-$(CONFIG_MPEGAUDIOHEADER) += mpegaudiodecheader.o mpegaudiodata.o +OBJS-$(CONFIG_MPEG4AUDIO) += mpeg4audio.o OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideodsp.o rl.o \ mpegvideo_motion.o mpegutils.o \ mpegvideodata.o mpegpicture.o @@ -160,10 +161,10 @@ OBJS-$(CONFIG_ZERO12V_DECODER) += 012v.o OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps_common.o aacps_float.o \ - mpeg4audio.o kbdwin.o \ + kbdwin.o \ sbrdsp.o aacpsdsp_float.o cbrt_data.o OBJS-$(CONFIG_AAC_FIXED_DECODER) += aacdec_fixed.o aactab.o aacsbr_fixed.o aacps_common.o aacps_fixed.o \ - mpeg4audio.o kbdwin.o \ + kbdwin.o \ sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacenctab.o \ aacpsy.o aactab.o \ @@ -189,7 +190,7 @@ OBJS-$(CONFIG_ALAC_DECODER) += alac.o alac_data.o alacdsp.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o alac_data.o OBJS-$(CONFIG_ALIAS_PIX_DECODER) += aliaspixdec.o OBJS-$(CONFIG_ALIAS_PIX_ENCODER) += aliaspixenc.o -OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mlz.o mpeg4audio.o +OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mlz.o OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \ celp_math.o acelp_filters.o \ acelp_vectors.o \ @@ -479,8 +480,8 @@ OBJS-$(CONFIG_MP3_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_MP3ADU_DECODER) += mpegaudiodec_fixed.o OBJS-$(CONFIG_MP3ADUFLOAT_DECODER) += mpegaudiodec_float.o OBJS-$(CONFIG_MP3FLOAT_DECODER) += mpegaudiodec_float.o -OBJS-$(CONFIG_MP3ON4_DECODER) += mpegaudiodec_fixed.o mpeg4audio.o -OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) += mpegaudiodec_float.o mpeg4audio.o +OBJS-$(CONFIG_MP3ON4_DECODER) += mpegaudiodec_fixed.o +OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) += mpegaudiodec_float.o OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o @@ -985,18 +986,13 @@ OBJS-$(CONFIG_VP8_QSV_HWACCEL) += qsvdec.o SHLIBOBJS += log2_tab.o reverse.o # General libavformat dependencies -OBJS-$(CONFIG_ISO_MEDIA) += mpeg4audio.o mpegaudiodata.o +OBJS-$(CONFIG_ISO_MEDIA) += mpegaudiodata.o -OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_FITS_DEMUXER) += fits.o -OBJS-$(CONFIG_LATM_MUXER) += mpeg4audio.o -OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += mpeg4audio.o -OBJS-$(CONFIG_MATROSKA_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o OBJS-$(CONFIG_TAK_DEMUXER) += tak.o -OBJS-$(CONFIG_WEBM_MUXER) += mpeg4audio.o # libavformat dependencies for static builds STLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o @@ -1087,8 +1083,7 @@ OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o # parsers OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o -OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ - mpeg4audio.o +OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o OBJS-$(CONFIG_AC3_PARSER) += aac_ac3_parser.o ac3tab.o \ ac3_channel_layout_tab.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o @@ -1148,7 +1143,7 @@ OBJS-$(CONFIG_XBM_PARSER) += xbm_parser.o OBJS-$(CONFIG_XMA_PARSER) += xma_parser.o # bitstream filters -OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o mpeg4audio.o +OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o OBJS-$(CONFIG_AV1_METADATA_BSF) += av1_metadata_bsf.o OBJS-$(CONFIG_AV1_FRAME_MERGE_BSF) += av1_frame_merge_bsf.o OBJS-$(CONFIG_AV1_FRAME_SPLIT_BSF) += av1_frame_split_bsf.o diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index fbbe187a51..22323a0a44 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" -#include "libavutil/thread.h" #include "libavformat/internal.h" #include "avdevice.h"