From patchwork Wed Jun 5 11:37:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49573 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp318864vqb; Wed, 5 Jun 2024 04:38:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxtLJLzMUO95140UJODVhN5fYTFEuX1DJjgj1SorB8tZc40Soav0XTlZFXYt4Y2hOZeqjbYCNVy2wkTlGgVYN7rnUuWGZnGZOqew== X-Google-Smtp-Source: AGHT+IE5MOLAolZVojptGwRS06I87Wz8EG8bNTX7mxzn/DDAd7DzW/sJa5RskSDxaCMy9LuWZnRy X-Received: by 2002:a17:906:684a:b0:a68:e0e4:302b with SMTP id a640c23a62f3a-a69a023627dmr154896166b.57.1717587502849; Wed, 05 Jun 2024 04:38:22 -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 a640c23a62f3a-a687176f8e8si559865866b.538.2024.06.05.04.38.21; Wed, 05 Jun 2024 04:38:22 -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=XLXjzHcs; 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 C4E9368D6A6; Wed, 5 Jun 2024 14:38:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2073.outbound.protection.outlook.com [40.92.91.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 669E568D52A for ; Wed, 5 Jun 2024 14:38:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oDFbXQAW5xKpAqd/gh5Dtg6jFbXzmyb1be35mKla+tJjtuspDPiwxobXvDsRcN3s5Mwh/DYsVPYti2ZIjO5wJgCTUE1ixf/VNoXmeURmNF1lTT1LfCHBloBHrla1i3QWXxXV8ju73LiZQgJyo1iMnSqv+j/+/f1K1q+rdgsoV1XrD7uwKhYaedS2Qd8+8VGy2pEwM0eCgBugTFIsWIukeAY3J3nhmEQWODUSp8FFfYc/KzIiEbdxKfjE9jkIH/syNS2juMKfgX5oIUiuZV0lxSYe80LVVIn/LMMi9ICgafjWs/Eli59DRuP4ffXO1Ms7fivHSWuP+rdSAo/jMg0Shg== 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=Hqs5Vmgjn0RURqisp36QFOxUuXFiD8t6BQMhqPDBoJ4=; b=NypMAT69NBpRo46PQM6yoMMao19up1SV9g0ieNE/kLliu707OdSIhpCVTMhc0bXURj+uL2pM3G2krm8u82x0s5kfCU563hV9nhx8/2GcSFhhN3yCnrhsGN/pUDUssC4E9Df9jREFUy4X8NvTZMErYEOqTu2ufjQINgy/xxrMQEIqs5yiYinJSo5k4fQooDJpA37CG8okuXztVUJiz4ovn51dfKBmYegVS+ASLBSQXPOlzVcllKotdXHojXraZxOamF6gWezkaFxuLRot52Bhp9BqR/KzONflK5+fuzAgSSWrefapN7eWlGXJYhnZZSaoSlpwVAVTYpfbeULmIhYTxg== 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=Hqs5Vmgjn0RURqisp36QFOxUuXFiD8t6BQMhqPDBoJ4=; b=XLXjzHcsA88x9QgNEhxFX3PjbUVl4iVg5w7T4Piauy3QJ+/sAQ/PvJx5vKr8v94nq+hMBOSzU0nXDefdxWJO2Gifln7HqYkUS4hASZCqrJQ/ZgtmvB95jraSpLPbsD/+26VIHtTXBKDvy2MzHTD3ft5C6BqyKBHNR+Ymecvj7MngJqqpgAASLYc2toblbERp3eRSelUBGJ68CQ4TmqXZQPqEyBjSRPxuD7Fr77uXnI1OdXkOFFFxnauO8LIE1tBhSFoVaHcADE2dakINy/f1yXv8GZGvPOcr+VSv1i4tsx5H/FeFmmHAA/Ae8EDtU8SokKNCznccdeN4SGXrubNJgg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PA2P250MB1069.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:40d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:38:09 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:38:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:37:55 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [KltIJfpAoj8XjnhCYKJ0XPUePQTsC940] X-ClientProxiedBy: FR4P281CA0438.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:c6::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605113801.1559329-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PA2P250MB1069:EE_ X-MS-Office365-Filtering-Correlation-Id: 6199a744-28f1-44e8-17ec-08dc8553f91c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: Kp2Zgup79Grmq9fYhOpjIGfTh4eay4eHyNisxeVZ1Zs1Bq3pl6nQmJ3uqPC4N2cyYzpHITl0lrBDoAAd9Z7O32maTYw8wvuvvb++yJkSvlE3t60P9sXgLtff5TQ2Bf8Kkbsveqg1S0ZceBHFqqzhHzGR+YwHeV01ugtXsJHb/KWTfYpnSbv3LTz/7HmTOZnMzCtbjp+cm57hnCmTl9lqHC74jKVYznk47PX5IaPuJUnfrd93MJK5TcPeS+os6PJLWSJooUVoLTzBTD7jZlCR99WO8KG9XyZ9P4FEjyAoc2cQrXvHOsn7GKJqo17af0ukQ4mgzQ0pvb6FokLUhy86+7x/TQZaxaPZ6WyK8PYa8C3UfjRt8sFhnVLxupwxC3z6ER4xi3xJTFXTJLgO+fu+5NVifu5UvCeKSBqulyrIoq2ZwjypFLUbhGa3zJNF3/RvFDBlc1vBGb/Q862J0v6JQIvEPDTZE/63wvEmRfMZyKduriZxK1CaT4tx0epGdGlpyTkEq0fkloPNpBomjvOpcua0ntJiVSn+JRtWM0kprC8zpgpDJvYlYhvvs/J+sgpqxHHwvZz1cKOB8gwLdYOxaJGrLUTPP/oiaCot/j5xYWdy5Yv/9OY5HsNoKg9vs+9B X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: scbOr9TtEw5Rf8gP8gEvBaF2f9a8vM4Dk0McN2kjxQK2qvnmnuZipuxXR6BG7ogxEVUe2kCZLjIZlGoekZeea2ZGR9n39r77LErB6wQe1sTQbvRQXrYpYfyRbVEihxtc6HumzPNGF1/+HWXYfZ5rqxlEtiQb6AZciL31bFI6HBV4bLpSq0eHKrrXXRQrSQLn89TRGD5A+UqgPlgt+9Sjn3YPi6RZ1T9RmQJWYHUzrS+DNiO6PI2TEvEVZvZKzZoLy1li46XRzX/X0gpc9gKjLhXkzRb0G6OkYOxLclB/hAw4G8PVkJj7OhY1BkitUjuWOYda+gDOMzHqBucGPBGJcTJEFct4YLSCArXcsz/FyO3rDjdlJQXFVUJVoVSo81osb801M6j82veYljr2rSJ0kgFTyr9vw5Z7BTyFHgYVdCuyz8XWljFpdDGMgKooyGgKAwc75/xx6ql5GL1mzUMS8SMGySeW8RcHrc4WjpvHDu1Naz+YDraq6DKphE0Vspc9bsHbfk0AasdsABu6NkC7qL2BEbP7qr3KfwRRSddzLy3B3XgRvtWTryJ+GfCe+0oCDg3KDPzHvH1fBBtpRtkheTJ5N9oUeeg3V5ZD5kJUwfIsDwFZw0gkoG4LPOgIpUAlscI85ogcl0G589lbPslU9bzAIl5nuJgnrWjA3ZUiKIdGHPwO/1FLMRh2u63/W2ijdRBY3b0BS3FBwCJtSdA5vUVykRoBY7ebM0ttH88GSP7jq/hCQU6sho0XcUPsMycgJnpLp5K7uPb+G6tBW3c9iZVQlxn2fFBc+rGUvXon4RbvOT7Pl/HIUVuFjZasI68GXTKE+9e+oNJ5dmj7VKEgv1Tb/tDMVUdACGUxB+dby1b8sGCUxIeDHoliO1SrfU100bffb5wtGEk9B6OwHjyY9kbgohwjyFJbVia0KBwp+ATehVp/5r+w/0TxfA56uVXwQ+Sqci9TkifjNbgIthl99xzvS+zo5Y4Uzxn9at9SFFO9XSFfWCM9icQJzz9HqBicA5cNL6W4wYetegmxXYZSMaq0DPnEIpKDmc2LdvtPCAOZeUKM07OEaI/Itp0Df+IUJCuIg5rT96H6f2i4ZXlesXrONNMNNjke9+skZ234EWADACfLUpnWmpiqk2YCg4QbMhEv42+42ziNQC0bW5tOZPL/FMeBMQ/lO1Xha6Q83vVROawIOKx/BsdtxxsF2FMFN+eYfSm1VV5IigSR7TvZe4r3N1IzgoRSbADecYE2t3cbvGraPQpmqewXLJTnRqPEknTBRf6C7DktkFIb918zfQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6199a744-28f1-44e8-17ec-08dc8553f91c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:38:08.9891 (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: PA2P250MB1069 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/hevc/Makefile: Move rules for lavc/* files to lavc/Makefile 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: SBo/K8MA6v6Y If any of these files (say A) would be changed in such a way that A acquires a new dependency on another file B, building B would need to be added to all the rules that lead to A being built. Yet currently the rules for several files are spread over the lavc Makefile and the Makefile of the lavc/hevc subdir, making it more likely to be forgotten. So move the rules for these files to the lavc/Makefile. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 4 ++++ libavcodec/hevc/Makefile | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8ab4398b6c..1a44352906 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -106,6 +106,9 @@ OBJS-$(CONFIG_H264PARSE) += h264_parse.o h264_ps.o h264data.o \ OBJS-$(CONFIG_H264PRED) += h264pred.o OBJS-$(CONFIG_H264QPEL) += h264qpel.o OBJS-$(CONFIG_H264_SEI) += h264_sei.o h2645_sei.o +OBJS-$(CONFIG_HEVCPARSE) += h2645data.o h2645_parse.o h2645_vui.o +OBJS-$(CONFIG_HEVC_SEI) += h2645_sei.o aom_film_grain.o \ + dynamic_hdr_vivid.o OBJS-$(CONFIG_HPELDSP) += hpeldsp.o OBJS-$(CONFIG_HUFFMAN) += huffman.o OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o @@ -427,6 +430,7 @@ OBJS-$(CONFIG_HCA_DECODER) += hcadec.o OBJS-$(CONFIG_HCOM_DECODER) += hcom.o OBJS-$(CONFIG_HDR_DECODER) += hdrdec.o OBJS-$(CONFIG_HDR_ENCODER) += hdrenc.o +OBJS-$(CONFIG_HEVC_DECODER) += aom_film_grain.o h274.o OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o diff --git a/libavcodec/hevc/Makefile b/libavcodec/hevc/Makefile index 9c385ef3da..93ed4213f6 100644 --- a/libavcodec/hevc/Makefile +++ b/libavcodec/hevc/Makefile @@ -2,8 +2,6 @@ clean:: $(RM) $(CLEANSUFFIXES:%=libavcodec/hevc/%) OBJS-$(CONFIG_HEVC_DECODER) += \ - aom_film_grain.o \ - h274.o \ hevc/cabac.o \ hevc/data.o \ hevc/dsp.o \ @@ -18,9 +16,6 @@ OBJS-$(CONFIG_HEVC_PARSER) += \ OBJS-$(CONFIG_HEVCPARSE) += \ - h2645data.o \ - h2645_parse.o \ - h2645_vui.o \ hevc/data.o \ hevc/parse.o \ hevc/ps.o \ @@ -28,9 +23,6 @@ OBJS-$(CONFIG_HEVCPARSE) += \ OBJS-$(CONFIG_HEVC_SEI) += \ hevc/sei.o \ - h2645_sei.o \ - dynamic_hdr_vivid.o \ - aom_film_grain.o \ libavcodec/hevc/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/