From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2905948E38 for ; Mon, 29 Jan 2024 09:55:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B6DF268BCC3; Mon, 29 Jan 2024 11:55:49 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2052.outbound.protection.outlook.com [40.92.89.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90D0068CAC6 for ; Mon, 29 Jan 2024 11:55:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SEQIH3IBb4DQWG41a6DTRUmDBCB9vWVcAa6o7CnZuOefkrj64d0aE1lNk9zCyWptZQFy8uxjRNwxoQgb2AJyu3M3RtWUhD3SodflOiB6GUFKchFA+Gcrm21q1N1ivzFDi5QAUEGz9B+FO+ZenGnv8bQ9G3BzqKWIrt+DPq4HsVE17cmkU2sxliGi0i26+TiRFOmjGWsfwbgBKD5oGZXtt0742G3iWAfP6ZMZ+g+oyQro/pR2TpofXXsJuNVzLcYBX+zYtixyEK4Joh6imbaOoxDxy+4WB02i6Pna/E3LgGTuyL8gLhBWg6lcGPJlUK4x96RAx3gb8D9T7b6eZ4E9bA== 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=jCjlH+EcpIZTAOpyPKGtYUNpxJD2COM92npeNU0NQjE=; b=gvEiCx6lROV6NTJ5SkGuVj1oRvOlSmxC/+lWT4rffXnoReqjwJf+zXvWkl110Ibo1dJJ6xFehLTO+xdu6iofdCpEmG818OPW/a6xFBT38+rhas8uvKVzQeg/3OUCLITIvJN12nabcREhB7iudnSNRwygEGjDfXNKHh+sNWU/UJwuD8WfVTXCWDNY5mBXEDzavDML+J1Tzf2FZsw2ZiabOF4y2iyM/3lofrjZ9DtNEqCRRvZRkGs0OlXp4/hDTr+eVgtnbpfrWD5iWM8apnwdVg4PWALtmogIcP21ZCmTMQHbt3sI1iOJFewVSkTnxmvMhKw1AfCggYqyPIywozHRNQ== 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=jCjlH+EcpIZTAOpyPKGtYUNpxJD2COM92npeNU0NQjE=; b=rS1OqRh23itA42QEmYgwJgRvI/UP7pgsVxnfY9EYFomkc620H/x+l52WcXTW8n4HzuttuXQ+QcPt1CspfYm3sF+IZv69NrxYb9a/h3qj9SMqMZKrWpuaRDZ1nHTYhRlFTwhlAykkKtiYKI37YWll5+l0BVuWRPlzaCMx2L9rzGj/klcrtoiVjIRW3GLBQoDnCyw7g8gRfGINa/MDWOVcM3lUIWo+7HnEMMoA8DexNESoPHn42Kvg9Awmcy78j7XK/yrZRTH/4QW3I8Td629lVtYJUrArC7ClAJGFcdDSblhDqqx4kNnoCcsD5M2Vzuh89H9wHsD19z0yyXlDpc1R5w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0172.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:323::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Mon, 29 Jan 2024 09:55:38 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Mon, 29 Jan 2024 09:55:38 +0000 Message-ID: Date: Mon, 29 Jan 2024 10:57:19 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240128174950.20735-1-anton@khirnov.net> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240128174950.20735-1-anton@khirnov.net> X-TMN: [A/jIGlW6ba+Jqgu7p6am2kNpYv8kpmuG9KUEIKVS0Vo=] X-ClientProxiedBy: FR0P281CA0163.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b3::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0172:EE_ X-MS-Office365-Filtering-Correlation-Id: c24f1955-257a-4141-a5a8-08dc20b0725c X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoDeMQYelObf/NOc8dndilFZeX41pmpa3cjWeu+WKmYyWKFRHXiPxx1ISl8UnxggYc4B/kfD2RO1XV9NHxumS82xA2TJ7+3dN++2V2OUs/F78eHvV4+lBBiZxN+lsV9SmLohZJBvbpun9Wycdz8V9Wq4H7LXahfcInA+KsEQm1cUIUgori+gwsv1n5QfuO8wtAJLqOgSx75U9nkYkn43bxH1OIeVjTMLoH5LP7i0VC73S0JxzUTdwr8LxjL/kK1Cw4tSx2yFMgMdTenhoo8UaYAutwL/EKxdko3ZmH2VsbdS1U3wHPuZC99G51VUvuqqQDctYTu3RH1O/MeovkvgUz0P4AgPwJosyorGBzJOq9zLikyO8CsMM7u1hLIAdx1BSsIinPUF21POP2pIogEbVHAbSlRlpjWVjJ98VFjzkbfx2mW56HzcvU0NGwniiUbdecoqWGDlEf7cPK5DKKZXcemeWzKgDf5qTI63cTDXln0DEeGEUfqJFQZ9wgdMkeUv3oyETvNDOYbA0A5m3kJl9IrMSIQ2V4d/n9f6zLMXELSy6ztgwRkK6YUjTDtuG893PU+xlzu7K325OrURV3UUP1QCS2nHSuq1WvqFGra9LzUjCMl/SqdhFcLQhIxSmnjoRSRrfXcZqLo57/XGgOZfjscnce0E9lRyihhpuXYSUAs5fGxC3KkXJRKgtpZFQ7Kvxm6OGw3yRpCsv+ZEvscy91wbT51Rzp5xon34a1vNVPOmkq3EGzPsj8cjMbAPsQNao4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g07UKjmGsRuhEt1JENKaTOgMyto80C0JCvbCTs5z+QI91r4O+P4AaSm1p6gxT+n7G7z89A7qhICfF3hQv+/nR+ad9DdNJaC55LoqtVsKajX0XmAB85Br4aarRRqX9QQJJsX5KpRiMpGwJZf7SBhbq2iYTdiYFE3q6ORyp7OlJIiBIh8yPtX6+SygkMdov/Sfvri85hhpDu+Ki7Ni374PpOXwhOtcyC6MxnQEJZT1nUOHXoHb2+wjFyN72ggsz+aoNeBiw41ooQ+nTRyefxsi5Fz038SSLJzpZ2cYXA5CaUmpR1ws2r8/TQUDiNBdj8VZabZ9c2bOGDgf/p0BsMoUZ5pnNpynZt4migfZGVz5KUmWoNfJXXUUNUneFf2U0cYfYbUzxyoF1KJT7qk6T+uX4K7RsXlWYwtdhW4jZGWnwXAZDZYDS6hSSmbte8fiwUY4U1RYqHk2P+wyIbPcFYR+8IGMaR6JyB/9yP8upZK0e0snGD9Nh2s8cigswflCmmCDXyMwBITXe1yygx4aIWYAaEwdx7l9X0NkYD9uQpRWQhp8c8BWAQ8YUhfT+owKrnzd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?d3UxT2I3M21qdkZKWG9BeWpVMEY4MEYrakFEZ1FkTDFhTEozVGVEWXpDc2dm?= =?utf-8?B?bUsxTnZjWXZNNDl6cjZ5QjFZL0Y1emMrS25YN3Q3ejgvTFViMHZPMU0ySUd1?= =?utf-8?B?OVRsY3NNZEthSGt2UmkwWVE2Mnc0OXgwblo5dVZYMno3SWx0SU9jVDQxQ1hi?= =?utf-8?B?Y0lrR3Q1bWRmRWRVbXFCQ09xaGR5NnRIT3RQTW5QYzdHWVRZRitmVVVidlQ4?= =?utf-8?B?Z01yeXM4Zm4vUEJnSTZCamdRMGwzeDEvZ0lESERDU05pbGdSSWczZVo0QjJp?= =?utf-8?B?TW8yemF0MXdlT3lDbWZNUXBVV3FuaDZJdlc0ZFM2SUFvUDFHU2txTFMrclpp?= =?utf-8?B?QnVlcVBhNDM2NVJsdzlhd2QvKzBlUDlxZDlVLy9PNWJGZFVTSWZoTmxoQnFl?= =?utf-8?B?WjJiSFh2bGRudkRBV1pRNG1aVWp2TG5FMk9FODN6dUtGY0VPcjVDLzN5NHpi?= =?utf-8?B?c1JHSHllVDZBb2w3R2U2VDlETllqK1dTY2NLUzJKT0Y3SjBVZkV0MlJDRjJj?= =?utf-8?B?ZktzWGtneHBERHEwQmJQazB4T00wUng4L05xNHB3N0cwalB5S1RTQ29OTWVE?= =?utf-8?B?Z0ZNRE1LRndSZnVqRmhmdXRCNGordm1BTkJMY2UxZXhIUmdvNTFnTFU0OHRX?= =?utf-8?B?Y1VqOVphQXdjN0VEU0FPTDEwYTVrV2hnR0FNVnA4NURvMHJWRjN0d2R1Yk50?= =?utf-8?B?V09GaHk5RE1BMXJIL0xzWVM0RWJhKzBHc1ZZRzUyRXpGUURTekViWWdWa3Zq?= =?utf-8?B?MWlQTm5LY3B2RjhGelVEM2RER2hYQThCakFYZlY0ejU5RGJoOHFFYm52Sktv?= =?utf-8?B?WWloMkcwbUFqYXFNeEw2Ym41NDQyR3ozZWRPTjJveSszTDhUWTJ4emVLUXU0?= =?utf-8?B?c0dLSXJRd0dMLzA1TTk3bFp5ZmpOWXhLU3RPd0JOYkp4bHBGUDNyUytBbkNj?= =?utf-8?B?cDJ2dEVqVDZlY2VqeEFQeWxpMmVrby9NWCs0UWtsa2FuSTVQWGJGcWFYU0Jz?= =?utf-8?B?K3RoR1lOeGFsOFphQUEvT2NVOTVnUnBoSnJDcG54dHRZbWxlWGx0Z1RrNHN6?= =?utf-8?B?WXJ6WkgvUVJWU3lWdHU0czMvaXgzQ1V6aVZDUElIWDgyTUx1cDJkSk1BSFZx?= =?utf-8?B?SW16ZDdvVE5nRWRJZm9wcFVoNm1ETVJTdGtOVlZydkRRVWNpVkZMU1YxczJP?= =?utf-8?B?Q05zeEF0VDNlWVNJYjNjQzhoOHFjdVpWcGI5VEpESTE5MkJFOUFIVnIxSDlx?= =?utf-8?B?WE81ZE13UjdmZzREcDVSNWlXcXdEMTdyYjErWVlMSUhiZlFpYStSUXZ4Rmxs?= =?utf-8?B?UTQrendndFJyQmhZa2s5SmNzTVJiV0NYRE5JaXdURHpzTUhPdFBxOW1sTVlK?= =?utf-8?B?a0t3RTZ2RlgyWFVkcWp1N2x4YmhSVnhDTUJnTlE4emk4UE1udERHc3kwaEdp?= =?utf-8?B?azVZd2U1WS9xNTdJUGZUdlI4S2IrbWtpc1oxbmtMSFJFK0pnMjEzNXdZNFFw?= =?utf-8?B?bDhnd0Z5YUdzaDRLeGJmems4b2p4by9pWGI3TjB2c0xWb1hZWGRSbjgvMmRF?= =?utf-8?B?ZzFzYmp1OUxXL2RTOEdHZnpxVWxjeFlOS2VaUWZqeTEycEN3d1l4cldtcjNL?= =?utf-8?B?TDJNWVJOM2IwbGZtaUNSQndBRE9udXBEdERSSzJ2VmErT1U0bnNVRnJOZjFI?= =?utf-8?Q?f9ktMt+V8uDRvnPvYLsD?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c24f1955-257a-4141-a5a8-08dc20b0725c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 09:55:38.7452 (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: AM8P250MB0172 Subject: Re: [FFmpeg-devel] [PATCH] lavc: move bitstream filters into bsf/ subdir 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Anton Khirnov: > --- > libavcodec/Makefile | 49 +--------------- > libavcodec/bsf/Makefile | 57 +++++++++++++++++++ > .../aac_adtstoasc.c} | 0 > .../av1_frame_merge.c} | 0 > .../av1_frame_split.c} | 0 > .../av1_metadata.c} | 0 > libavcodec/{chomp_bsf.c => bsf/chomp.c} | 0 > libavcodec/{dca_core_bsf.c => bsf/dca_core.c} | 0 > libavcodec/{dts2pts_bsf.c => bsf/dts2pts.c} | 0 > .../dump_extradata.c} | 0 > .../dv_error_marker.c} | 0 > .../{eac3_core_bsf.c => bsf/eac3_core.c} | 0 > .../evc_frame_merge.c} | 0 > .../extract_extradata.c} | 0 > .../filter_units.c} | 0 > .../h264_metadata.c} | 0 > .../h264_mp4toannexb.c} | 0 > .../h264_redundant_pps.c} | 0 > .../h265_metadata.c} | 0 > .../h266_metadata.c} | 0 > .../hapqa_extract.c} | 0 > .../hevc_mp4toannexb.c} | 0 > .../imx_dump_header.c} | 0 > .../media100_to_mjpegb.c} | 0 > .../{mjpeg2jpeg_bsf.c => bsf/mjpeg2jpeg.c} | 0 > .../mjpega_dump_header.c} | 0 > libavcodec/{movsub_bsf.c => bsf/movsub.c} | 0 > .../mp3_header_decompress.c} | 0 > .../mpeg2_metadata.c} | 0 > .../mpeg4_unpack_bframes.c} | 0 > libavcodec/{noise_bsf.c => bsf/noise.c} | 0 > libavcodec/{null_bsf.c => bsf/null.c} | 0 > .../opus_metadata.c} | 0 > .../{pcm_rechunk_bsf.c => bsf/pcm_rechunk.c} | 0 > .../pgs_frame_merge.c} | 0 > .../prores_metadata.c} | 0 > .../remove_extradata.c} | 0 > libavcodec/{setts_bsf.c => bsf/setts.c} | 0 > .../trace_headers.c} | 0 > .../{truehd_core_bsf.c => bsf/truehd_core.c} | 0 > .../vp9_metadata.c} | 0 > .../vp9_raw_reorder.c} | 0 > .../vp9_superframe.c} | 0 > .../vp9_superframe_split.c} | 0 > .../vvc_mp4toannexb.c} | 0 > 45 files changed, 58 insertions(+), 48 deletions(-) > create mode 100644 libavcodec/bsf/Makefile > rename libavcodec/{aac_adtstoasc_bsf.c => bsf/aac_adtstoasc.c} (100%) > rename libavcodec/{av1_frame_merge_bsf.c => bsf/av1_frame_merge.c} (100%) > rename libavcodec/{av1_frame_split_bsf.c => bsf/av1_frame_split.c} (100%) > rename libavcodec/{av1_metadata_bsf.c => bsf/av1_metadata.c} (100%) > rename libavcodec/{chomp_bsf.c => bsf/chomp.c} (100%) > rename libavcodec/{dca_core_bsf.c => bsf/dca_core.c} (100%) > rename libavcodec/{dts2pts_bsf.c => bsf/dts2pts.c} (100%) > rename libavcodec/{dump_extradata_bsf.c => bsf/dump_extradata.c} (100%) > rename libavcodec/{dv_error_marker_bsf.c => bsf/dv_error_marker.c} (100%) > rename libavcodec/{eac3_core_bsf.c => bsf/eac3_core.c} (100%) > rename libavcodec/{evc_frame_merge_bsf.c => bsf/evc_frame_merge.c} (100%) > rename libavcodec/{extract_extradata_bsf.c => bsf/extract_extradata.c} (100%) > rename libavcodec/{filter_units_bsf.c => bsf/filter_units.c} (100%) > rename libavcodec/{h264_metadata_bsf.c => bsf/h264_metadata.c} (100%) > rename libavcodec/{h264_mp4toannexb_bsf.c => bsf/h264_mp4toannexb.c} (100%) > rename libavcodec/{h264_redundant_pps_bsf.c => bsf/h264_redundant_pps.c} (100%) > rename libavcodec/{h265_metadata_bsf.c => bsf/h265_metadata.c} (100%) > rename libavcodec/{h266_metadata_bsf.c => bsf/h266_metadata.c} (100%) > rename libavcodec/{hapqa_extract_bsf.c => bsf/hapqa_extract.c} (100%) > rename libavcodec/{hevc_mp4toannexb_bsf.c => bsf/hevc_mp4toannexb.c} (100%) > rename libavcodec/{imx_dump_header_bsf.c => bsf/imx_dump_header.c} (100%) > rename libavcodec/{media100_to_mjpegb_bsf.c => bsf/media100_to_mjpegb.c} (100%) > rename libavcodec/{mjpeg2jpeg_bsf.c => bsf/mjpeg2jpeg.c} (100%) > rename libavcodec/{mjpega_dump_header_bsf.c => bsf/mjpega_dump_header.c} (100%) > rename libavcodec/{movsub_bsf.c => bsf/movsub.c} (100%) > rename libavcodec/{mp3_header_decompress_bsf.c => bsf/mp3_header_decompress.c} (100%) > rename libavcodec/{mpeg2_metadata_bsf.c => bsf/mpeg2_metadata.c} (100%) > rename libavcodec/{mpeg4_unpack_bframes_bsf.c => bsf/mpeg4_unpack_bframes.c} (100%) > rename libavcodec/{noise_bsf.c => bsf/noise.c} (100%) > rename libavcodec/{null_bsf.c => bsf/null.c} (100%) > rename libavcodec/{opus_metadata_bsf.c => bsf/opus_metadata.c} (100%) > rename libavcodec/{pcm_rechunk_bsf.c => bsf/pcm_rechunk.c} (100%) > rename libavcodec/{pgs_frame_merge_bsf.c => bsf/pgs_frame_merge.c} (100%) > rename libavcodec/{prores_metadata_bsf.c => bsf/prores_metadata.c} (100%) > rename libavcodec/{remove_extradata_bsf.c => bsf/remove_extradata.c} (100%) > rename libavcodec/{setts_bsf.c => bsf/setts.c} (100%) > rename libavcodec/{trace_headers_bsf.c => bsf/trace_headers.c} (100%) > rename libavcodec/{truehd_core_bsf.c => bsf/truehd_core.c} (100%) > rename libavcodec/{vp9_metadata_bsf.c => bsf/vp9_metadata.c} (100%) > rename libavcodec/{vp9_raw_reorder_bsf.c => bsf/vp9_raw_reorder.c} (100%) > rename libavcodec/{vp9_superframe_bsf.c => bsf/vp9_superframe.c} (100%) > rename libavcodec/{vp9_superframe_split_bsf.c => bsf/vp9_superframe_split.c} (100%) > rename libavcodec/{vvc_mp4toannexb_bsf.c => bsf/vvc_mp4toannexb.c} (100%) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 96361ac794..43b557faaf 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1233,54 +1233,7 @@ OBJS-$(CONFIG_XMA_PARSER) += xma_parser.o > OBJS-$(CONFIG_XWD_PARSER) += xwd_parser.o > > # bitstream filters > -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 > -OBJS-$(CONFIG_CHOMP_BSF) += chomp_bsf.o > -OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o > -OBJS-$(CONFIG_DCA_CORE_BSF) += dca_core_bsf.o > -OBJS-$(CONFIG_DTS2PTS_BSF) += dts2pts_bsf.o > -OBJS-$(CONFIG_DV_ERROR_MARKER_BSF) += dv_error_marker_bsf.o > -OBJS-$(CONFIG_EAC3_CORE_BSF) += eac3_core_bsf.o > -OBJS-$(CONFIG_EXTRACT_EXTRADATA_BSF) += extract_extradata_bsf.o \ > - av1_parse.o h2645_parse.o > -OBJS-$(CONFIG_FILTER_UNITS_BSF) += filter_units_bsf.o > -OBJS-$(CONFIG_H264_METADATA_BSF) += h264_metadata_bsf.o h264_levels.o \ > - h2645data.o > -OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o > -OBJS-$(CONFIG_H264_REDUNDANT_PPS_BSF) += h264_redundant_pps_bsf.o > -OBJS-$(CONFIG_HAPQA_EXTRACT_BSF) += hapqa_extract_bsf.o hap.o > -OBJS-$(CONFIG_HEVC_METADATA_BSF) += h265_metadata_bsf.o h265_profile_level.o \ > - h2645data.o > -OBJS-$(CONFIG_HEVC_MP4TOANNEXB_BSF) += hevc_mp4toannexb_bsf.o > -OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o > -OBJS-$(CONFIG_MEDIA100_TO_MJPEGB_BSF) += media100_to_mjpegb_bsf.o > -OBJS-$(CONFIG_MJPEG2JPEG_BSF) += mjpeg2jpeg_bsf.o > -OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o > -OBJS-$(CONFIG_MPEG4_UNPACK_BFRAMES_BSF) += mpeg4_unpack_bframes_bsf.o > -OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o > -OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o \ > - mpegaudiotabs.o > -OBJS-$(CONFIG_MPEG2_METADATA_BSF) += mpeg2_metadata_bsf.o > -OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o > -OBJS-$(CONFIG_NULL_BSF) += null_bsf.o > -OBJS-$(CONFIG_OPUS_METADATA_BSF) += opus_metadata_bsf.o > -OBJS-$(CONFIG_PCM_RECHUNK_BSF) += pcm_rechunk_bsf.o > -OBJS-$(CONFIG_PGS_FRAME_MERGE_BSF) += pgs_frame_merge_bsf.o > -OBJS-$(CONFIG_PRORES_METADATA_BSF) += prores_metadata_bsf.o > -OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o av1_parse.o > -OBJS-$(CONFIG_SETTS_BSF) += setts_bsf.o > -OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o > -OBJS-$(CONFIG_TRACE_HEADERS_BSF) += trace_headers_bsf.o > -OBJS-$(CONFIG_TRUEHD_CORE_BSF) += truehd_core_bsf.o mlp_parse.o mlp.o > -OBJS-$(CONFIG_VP9_METADATA_BSF) += vp9_metadata_bsf.o > -OBJS-$(CONFIG_VP9_RAW_REORDER_BSF) += vp9_raw_reorder_bsf.o > -OBJS-$(CONFIG_VP9_SUPERFRAME_BSF) += vp9_superframe_bsf.o > -OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF) += vp9_superframe_split_bsf.o > -OBJS-$(CONFIG_VVC_METADATA_BSF) += h266_metadata_bsf.o > -OBJS-$(CONFIG_VVC_MP4TOANNEXB_BSF) += vvc_mp4toannexb_bsf.o > -OBJS-$(CONFIG_EVC_FRAME_MERGE_BSF) += evc_frame_merge_bsf.o > +include $(SRC_PATH)/libavcodec/bsf/Makefile > > # thread libraries > OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o > diff --git a/libavcodec/bsf/Makefile b/libavcodec/bsf/Makefile > new file mode 100644 > index 0000000000..21a39adc4b > --- /dev/null > +++ b/libavcodec/bsf/Makefile > @@ -0,0 +1,57 @@ > +clean:: > + $(RM) $(CLEANSUFFIXES:%=libavcodec/bsf/%) > + > +OBJS_BSF-$(CONFIG_AAC_ADTSTOASC_BSF) += bsf/aac_adtstoasc.o > +OBJS_BSF-$(CONFIG_AV1_METADATA_BSF) += bsf/av1_metadata.o > +OBJS_BSF-$(CONFIG_AV1_FRAME_MERGE_BSF) += bsf/av1_frame_merge.o > +OBJS_BSF-$(CONFIG_AV1_FRAME_SPLIT_BSF) += bsf/av1_frame_split.o > +OBJS_BSF-$(CONFIG_CHOMP_BSF) += bsf/chomp.o > +OBJS_BSF-$(CONFIG_DUMP_EXTRADATA_BSF) += bsf/dump_extradata.o > +OBJS_BSF-$(CONFIG_DCA_CORE_BSF) += bsf/dca_core.o > +OBJS_BSF-$(CONFIG_DTS2PTS_BSF) += bsf/dts2pts.o > +OBJS_BSF-$(CONFIG_DV_ERROR_MARKER_BSF) += bsf/dv_error_marker.o > +OBJS_BSF-$(CONFIG_EAC3_CORE_BSF) += bsf/eac3_core.o > +OBJS_BSF-$(CONFIG_EXTRACT_EXTRADATA_BSF) += bsf/extract_extradata.o \ > + av1_parse.o h2645_parse.o > +OBJS_BSF-$(CONFIG_FILTER_UNITS_BSF) += bsf/filter_units.o > +OBJS_BSF-$(CONFIG_H264_METADATA_BSF) += bsf/h264_metadata.o \ > + h264_levels.o h2645data.o > +OBJS_BSF-$(CONFIG_H264_MP4TOANNEXB_BSF) += bsf/h264_mp4toannexb.o > +OBJS_BSF-$(CONFIG_H264_REDUNDANT_PPS_BSF) += bsf/h264_redundant_pps.o > +OBJS_BSF-$(CONFIG_HAPQA_EXTRACT_BSF) += bsf/hapqa_extract.o \ > + hap.o > +OBJS_BSF-$(CONFIG_HEVC_METADATA_BSF) += bsf/h265_metadata.o \ > + h265_profile_level.o h2645data.o > +OBJS_BSF-$(CONFIG_HEVC_MP4TOANNEXB_BSF) += bsf/hevc_mp4toannexb.o > +OBJS_BSF-$(CONFIG_IMX_DUMP_HEADER_BSF) += bsf/imx_dump_header.o > +OBJS_BSF-$(CONFIG_MEDIA100_TO_MJPEGB_BSF) += bsf/media100_to_mjpegb.o > +OBJS_BSF-$(CONFIG_MJPEG2JPEG_BSF) += bsf/mjpeg2jpeg.o > +OBJS_BSF-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += bsf/mjpega_dump_header.o > +OBJS_BSF-$(CONFIG_MPEG4_UNPACK_BFRAMES_BSF) += bsf/mpeg4_unpack_bframes.o > +OBJS_BSF-$(CONFIG_MOV2TEXTSUB_BSF) += bsf/movsub.o > +OBJS_BSF-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += bsf/mp3_header_decompress.o \ > + mpegaudiotabs.o > +OBJS_BSF-$(CONFIG_MPEG2_METADATA_BSF) += bsf/mpeg2_metadata.o > +OBJS_BSF-$(CONFIG_NOISE_BSF) += bsf/noise.o > +OBJS_BSF-$(CONFIG_NULL_BSF) += bsf/null.o > +OBJS_BSF-$(CONFIG_OPUS_METADATA_BSF) += bsf/opus_metadata.o > +OBJS_BSF-$(CONFIG_PCM_RECHUNK_BSF) += bsf/pcm_rechunk.o > +OBJS_BSF-$(CONFIG_PGS_FRAME_MERGE_BSF) += bsf/pgs_frame_merge.o > +OBJS_BSF-$(CONFIG_PRORES_METADATA_BSF) += bsf/prores_metadata.o > +OBJS_BSF-$(CONFIG_REMOVE_EXTRADATA_BSF) += bsf/remove_extradata.o av1_parse.o > +OBJS_BSF-$(CONFIG_SETTS_BSF) += bsf/setts.o > +OBJS_BSF-$(CONFIG_TEXT2MOVSUB_BSF) += bsf/movsub.o > +OBJS_BSF-$(CONFIG_TRACE_HEADERS_BSF) += bsf/trace_headers.o > +OBJS_BSF-$(CONFIG_TRUEHD_CORE_BSF) += bsf/truehd_core.o mlp_parse.o mlp.o > +OBJS_BSF-$(CONFIG_VP9_METADATA_BSF) += bsf/vp9_metadata.o > +OBJS_BSF-$(CONFIG_VP9_RAW_REORDER_BSF) += bsf/vp9_raw_reorder.o > +OBJS_BSF-$(CONFIG_VP9_SUPERFRAME_BSF) += bsf/vp9_superframe.o > +OBJS_BSF-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF) += bsf/vp9_superframe_split.o > +OBJS_BSF-$(CONFIG_VVC_METADATA_BSF) += bsf/h266_metadata.o > +OBJS_BSF-$(CONFIG_VVC_MP4TOANNEXB_BSF) += bsf/vvc_mp4toannexb.o > +OBJS_BSF-$(CONFIG_EVC_FRAME_MERGE_BSF) += bsf/evc_frame_merge.o > + > +# add libavcodec/ to include path for bsfs > +$(addprefix libavcodec/, $(sort $(filter bsf/%,$(OBJS_BSF-yes)))): CPPFLAGS += -I$(SRC_PATH)/libavcodec/ 1. Why sort? 2. Adding dependencies for stuff not in this folder is different from how we do it for arch-specific stuff. 3. And actually, it is worse: Imagine someone changed h265_profile_level.c in such a way that h265_profile_level.o now relies on stuff provided by a different translation unit. Then you need to add said dependency to all the components that require h265_profile_level.o. If such a dependency exists in another Makefile for a subfolder, it is likely that this will be forgotten. (Of course, seeing that a BSF requires h265_profile_level.o might make the developer think twice whether it is really a good idea to add this new code to it.) > + > +OBJS += $(OBJS_BSF-yes) > diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/bsf/aac_adtstoasc.c > similarity index 100% > rename from libavcodec/aac_adtstoasc_bsf.c > rename to libavcodec/bsf/aac_adtstoasc.c > diff --git a/libavcodec/av1_frame_merge_bsf.c b/libavcodec/bsf/av1_frame_merge.c > similarity index 100% > rename from libavcodec/av1_frame_merge_bsf.c > rename to libavcodec/bsf/av1_frame_merge.c > diff --git a/libavcodec/av1_frame_split_bsf.c b/libavcodec/bsf/av1_frame_split.c > similarity index 100% > rename from libavcodec/av1_frame_split_bsf.c > rename to libavcodec/bsf/av1_frame_split.c > diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/bsf/av1_metadata.c > similarity index 100% > rename from libavcodec/av1_metadata_bsf.c > rename to libavcodec/bsf/av1_metadata.c > diff --git a/libavcodec/chomp_bsf.c b/libavcodec/bsf/chomp.c > similarity index 100% > rename from libavcodec/chomp_bsf.c > rename to libavcodec/bsf/chomp.c > diff --git a/libavcodec/dca_core_bsf.c b/libavcodec/bsf/dca_core.c > similarity index 100% > rename from libavcodec/dca_core_bsf.c > rename to libavcodec/bsf/dca_core.c > diff --git a/libavcodec/dts2pts_bsf.c b/libavcodec/bsf/dts2pts.c > similarity index 100% > rename from libavcodec/dts2pts_bsf.c > rename to libavcodec/bsf/dts2pts.c > diff --git a/libavcodec/dump_extradata_bsf.c b/libavcodec/bsf/dump_extradata.c > similarity index 100% > rename from libavcodec/dump_extradata_bsf.c > rename to libavcodec/bsf/dump_extradata.c > diff --git a/libavcodec/dv_error_marker_bsf.c b/libavcodec/bsf/dv_error_marker.c > similarity index 100% > rename from libavcodec/dv_error_marker_bsf.c > rename to libavcodec/bsf/dv_error_marker.c > diff --git a/libavcodec/eac3_core_bsf.c b/libavcodec/bsf/eac3_core.c > similarity index 100% > rename from libavcodec/eac3_core_bsf.c > rename to libavcodec/bsf/eac3_core.c > diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/bsf/evc_frame_merge.c > similarity index 100% > rename from libavcodec/evc_frame_merge_bsf.c > rename to libavcodec/bsf/evc_frame_merge.c > diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/bsf/extract_extradata.c > similarity index 100% > rename from libavcodec/extract_extradata_bsf.c > rename to libavcodec/bsf/extract_extradata.c > diff --git a/libavcodec/filter_units_bsf.c b/libavcodec/bsf/filter_units.c > similarity index 100% > rename from libavcodec/filter_units_bsf.c > rename to libavcodec/bsf/filter_units.c > diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/bsf/h264_metadata.c > similarity index 100% > rename from libavcodec/h264_metadata_bsf.c > rename to libavcodec/bsf/h264_metadata.c > diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/bsf/h264_mp4toannexb.c > similarity index 100% > rename from libavcodec/h264_mp4toannexb_bsf.c > rename to libavcodec/bsf/h264_mp4toannexb.c > diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/bsf/h264_redundant_pps.c > similarity index 100% > rename from libavcodec/h264_redundant_pps_bsf.c > rename to libavcodec/bsf/h264_redundant_pps.c > diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/bsf/h265_metadata.c > similarity index 100% > rename from libavcodec/h265_metadata_bsf.c > rename to libavcodec/bsf/h265_metadata.c > diff --git a/libavcodec/h266_metadata_bsf.c b/libavcodec/bsf/h266_metadata.c > similarity index 100% > rename from libavcodec/h266_metadata_bsf.c > rename to libavcodec/bsf/h266_metadata.c > diff --git a/libavcodec/hapqa_extract_bsf.c b/libavcodec/bsf/hapqa_extract.c > similarity index 100% > rename from libavcodec/hapqa_extract_bsf.c > rename to libavcodec/bsf/hapqa_extract.c > diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/bsf/hevc_mp4toannexb.c > similarity index 100% > rename from libavcodec/hevc_mp4toannexb_bsf.c > rename to libavcodec/bsf/hevc_mp4toannexb.c > diff --git a/libavcodec/imx_dump_header_bsf.c b/libavcodec/bsf/imx_dump_header.c > similarity index 100% > rename from libavcodec/imx_dump_header_bsf.c > rename to libavcodec/bsf/imx_dump_header.c > diff --git a/libavcodec/media100_to_mjpegb_bsf.c b/libavcodec/bsf/media100_to_mjpegb.c > similarity index 100% > rename from libavcodec/media100_to_mjpegb_bsf.c > rename to libavcodec/bsf/media100_to_mjpegb.c > diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/bsf/mjpeg2jpeg.c > similarity index 100% > rename from libavcodec/mjpeg2jpeg_bsf.c > rename to libavcodec/bsf/mjpeg2jpeg.c > diff --git a/libavcodec/mjpega_dump_header_bsf.c b/libavcodec/bsf/mjpega_dump_header.c > similarity index 100% > rename from libavcodec/mjpega_dump_header_bsf.c > rename to libavcodec/bsf/mjpega_dump_header.c > diff --git a/libavcodec/movsub_bsf.c b/libavcodec/bsf/movsub.c > similarity index 100% > rename from libavcodec/movsub_bsf.c > rename to libavcodec/bsf/movsub.c > diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/bsf/mp3_header_decompress.c > similarity index 100% > rename from libavcodec/mp3_header_decompress_bsf.c > rename to libavcodec/bsf/mp3_header_decompress.c > diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/bsf/mpeg2_metadata.c > similarity index 100% > rename from libavcodec/mpeg2_metadata_bsf.c > rename to libavcodec/bsf/mpeg2_metadata.c > diff --git a/libavcodec/mpeg4_unpack_bframes_bsf.c b/libavcodec/bsf/mpeg4_unpack_bframes.c > similarity index 100% > rename from libavcodec/mpeg4_unpack_bframes_bsf.c > rename to libavcodec/bsf/mpeg4_unpack_bframes.c > diff --git a/libavcodec/noise_bsf.c b/libavcodec/bsf/noise.c > similarity index 100% > rename from libavcodec/noise_bsf.c > rename to libavcodec/bsf/noise.c > diff --git a/libavcodec/null_bsf.c b/libavcodec/bsf/null.c > similarity index 100% > rename from libavcodec/null_bsf.c > rename to libavcodec/bsf/null.c > diff --git a/libavcodec/opus_metadata_bsf.c b/libavcodec/bsf/opus_metadata.c > similarity index 100% > rename from libavcodec/opus_metadata_bsf.c > rename to libavcodec/bsf/opus_metadata.c > diff --git a/libavcodec/pcm_rechunk_bsf.c b/libavcodec/bsf/pcm_rechunk.c > similarity index 100% > rename from libavcodec/pcm_rechunk_bsf.c > rename to libavcodec/bsf/pcm_rechunk.c > diff --git a/libavcodec/pgs_frame_merge_bsf.c b/libavcodec/bsf/pgs_frame_merge.c > similarity index 100% > rename from libavcodec/pgs_frame_merge_bsf.c > rename to libavcodec/bsf/pgs_frame_merge.c > diff --git a/libavcodec/prores_metadata_bsf.c b/libavcodec/bsf/prores_metadata.c > similarity index 100% > rename from libavcodec/prores_metadata_bsf.c > rename to libavcodec/bsf/prores_metadata.c > diff --git a/libavcodec/remove_extradata_bsf.c b/libavcodec/bsf/remove_extradata.c > similarity index 100% > rename from libavcodec/remove_extradata_bsf.c > rename to libavcodec/bsf/remove_extradata.c > diff --git a/libavcodec/setts_bsf.c b/libavcodec/bsf/setts.c > similarity index 100% > rename from libavcodec/setts_bsf.c > rename to libavcodec/bsf/setts.c > diff --git a/libavcodec/trace_headers_bsf.c b/libavcodec/bsf/trace_headers.c > similarity index 100% > rename from libavcodec/trace_headers_bsf.c > rename to libavcodec/bsf/trace_headers.c > diff --git a/libavcodec/truehd_core_bsf.c b/libavcodec/bsf/truehd_core.c > similarity index 100% > rename from libavcodec/truehd_core_bsf.c > rename to libavcodec/bsf/truehd_core.c > diff --git a/libavcodec/vp9_metadata_bsf.c b/libavcodec/bsf/vp9_metadata.c > similarity index 100% > rename from libavcodec/vp9_metadata_bsf.c > rename to libavcodec/bsf/vp9_metadata.c > diff --git a/libavcodec/vp9_raw_reorder_bsf.c b/libavcodec/bsf/vp9_raw_reorder.c > similarity index 100% > rename from libavcodec/vp9_raw_reorder_bsf.c > rename to libavcodec/bsf/vp9_raw_reorder.c > diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/bsf/vp9_superframe.c > similarity index 100% > rename from libavcodec/vp9_superframe_bsf.c > rename to libavcodec/bsf/vp9_superframe.c > diff --git a/libavcodec/vp9_superframe_split_bsf.c b/libavcodec/bsf/vp9_superframe_split.c > similarity index 100% > rename from libavcodec/vp9_superframe_split_bsf.c > rename to libavcodec/bsf/vp9_superframe_split.c > diff --git a/libavcodec/vvc_mp4toannexb_bsf.c b/libavcodec/bsf/vvc_mp4toannexb.c > similarity index 100% > rename from libavcodec/vvc_mp4toannexb_bsf.c > rename to libavcodec/bsf/vvc_mp4toannexb.c _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".