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 7CB3F41234 for ; Wed, 16 Feb 2022 04:38:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 64FE868B227; Wed, 16 Feb 2022 06:38:15 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073012.outbound.protection.outlook.com [40.92.73.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2C136804A0 for ; Wed, 16 Feb 2022 06:38:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i7icZna7x1Gug4B4LYR5hsVDDfnCpUsSEvwUM4SymqLEB+p8zrGe2YsENqU7kbYvfsQLldZom8YySqn6EfAIdcUEx0mDTwiayL6Lx+dl3TFyc4CotJkbmB5rtJvG9uunc1fHoEUK6dEVQZ+c3c6A2EhOJH1bYAJss7qN4NE2tZoNq+6CkPNo8O3fTvtyN6S4lINcionrwjkccQpUU3u0iW5wwNdEmlXti6LMfiLifZJNGKlyVkG0V9ns9rC96MGmTnAtx0uD59PLJZMRRMt+gK5nDjLeQlRVpmOcWAvxFvdmikga0wpkDwPsLa1LOrglI0NPkfD7uM9OgT3ZiNDIIw== 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=L6ppm6dFTVQDVR/O+x5d+XUzGgFhVXrPH+2waWcsdbg=; b=lVBlDwQ0RwIklVT4HZxSSXxYR5eQkHLIe6VHxf6tfo8cflnGhmS4BUoJUnmN0WkAP99FPSUh062XU3EqvWOMqWfcJspVuVj7zjvIaI78wcsXK3p8XBGKD9mP0Ak6nSEJmNe3cJJVV8NuAI5hu30W4nOQ8kyNRkVuYYVJ99no4I5vmuAVtBrKwlWVFIe6MeTNyJexqC5CHH2nct1lWbwPCnfrhOz5OagLpfwr+SPtekWWLA6oHjNKiDrATBxqmEovehKe6k/kfZjY+vLAX5ob8fzYmcHm4vzL9E3T0EmlzMErSYPWiplygpLw0RA59nFgU7OTrFV1g3fGiNHm+3jI+g== 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=L6ppm6dFTVQDVR/O+x5d+XUzGgFhVXrPH+2waWcsdbg=; b=rGc/dTual+LIlRvDEGbF4srAi+6oDLqahOY6r9Y3iZN55DlsPO/xOV/SNN31doDLsjWxQUVj70i6D70uvhcDH+TUdBvhaDc3aYMosLxCF/IBTaWcsjOcS4YkjpyIq3uBO5UIZEETqlcqyHd1GlcKRB9YLytaVbNI3dOJ4qATfDzf9BlsJD1OfoEivfzV0d3AP4Witp97DepCZF8/TG0qVsULSxkI6ugOqz14HazOBRHo9nRiuHjwlJELC+83yDRgNm3LPMxmc2wZsCHjN1V+Hu0YSjbgl1bE/EO9eqzsyQIL1echshq35DK+xTzhF7onmQJUyCUbjior8owpZQGwKg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7093.eurprd03.prod.outlook.com (2603:10a6:20b:293::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Wed, 16 Feb 2022 04:38:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%4]) with mapi id 15.20.4995.016; Wed, 16 Feb 2022 04:38:05 +0000 Message-ID: Date: Wed, 16 Feb 2022 05:38:04 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220215215228.12252-1-michael@niedermayer.cc> From: Andreas Rheinhardt In-Reply-To: <20220215215228.12252-1-michael@niedermayer.cc> X-TMN: [zRC1PCsBm3vJXV/ZeGsFNeut+n6W6L5f] X-ClientProxiedBy: AM6PR04CA0004.eurprd04.prod.outlook.com (2603:10a6:20b:92::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1fd0434-f3e0-4705-2089-08d9f1061f98 X-MS-TrafficTypeDiagnostic: AS8PR03MB7093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +YpjRbft1zJezFDakaVneS4nuNfjmW+SH5KVs0p6DC4yOUdXOuug7FwiSPUTglV30f8uGkl1oAIcGZLMHmJqWLnVV3paytbC5LO22bCqRMbGLTbLEJIyfq9nyuSRLS4XpVy8WpyTjXXd4b06eXj+MHHAaxSCkxCJkxBgLKRhWmNXa60lEJEstScjrxcBLF3lBqY646p7EB/bomtBkgsmPCG6xZFtOc7PDHEGwT9pB0DxzLzMBASTN/RIAJ9eGC+mEqaViIWMaTd0II3gAbJzAdhpk5GYZm02j7jskcnnENzJcw28vkggAfppYM61EBz9JB/qHKw6BR7UmjeDBHryJZ2cmUoev0/ja7+EIBOlHkHzGwxjmsUTsorDHTDe1HUgAreJlNHG6QH5JagH9lxmAmYitvnSknoHLIdCXRVHDGJ60BzO0F4adc0l3rt8/d2N+8eihJadfU3Sq65SpSPSBrQSazHQYceRVd+85zXeJ+Ms21GDTioR9Vy6Bmy9d6ZDGRBDvRoIZSAkF2jV29Up9Rly5UgM2lVGT7iTEuJTImVVe/5M7CC2sspkjFhabZerZa5oRoxh84nPMG73jjwJXQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R0FaTFhHNkIycmt3UmkxS3FGM3dncEJ4aUpKSUt5VWZtb2xIcGlPaVJ4ZHUr?= =?utf-8?B?aGNvU0xhbnova3JWbkxqTEMzSlFCY2dia0xWc1lrb2ZDeEc0Q3NLdExhMWs4?= =?utf-8?B?NVRmVkx2cmN2WjRvY1dOY0o1MGlUS0d4OUxtTVRwc1BLclJQb1VEYlNaZFhy?= =?utf-8?B?MnY5aElrV1MwdWc2UkU1ckJBbHpRekxrOXhXRkxqRkQwTU9QWlRrTmlpZ1Qy?= =?utf-8?B?dXQ0N2c1UTJXbk8rZkErMCtvamNqYXIwbVJINWs2M2lsbmFOUFlvK0s1eno2?= =?utf-8?B?RDQ3Qk1TWG9DV2VkL09QeDlkb3AxL053elJLRi93LzZycEF5RFJsQ0NwcEFw?= =?utf-8?B?amU1dEhKMVZONWV1eXlwbGVWNGxKWWh2M3ZVVnh2TFhYRUtqOUtQSHJpSDVO?= =?utf-8?B?V2djZ2JkUmNraTVkOENTWmI2bGNZNW1YYW5OU1VNVHo4ODJZNWNqVk95UWVz?= =?utf-8?B?RmdhTUtCUzNWYzVncm82OW5rWFcvQTZEeHNjN1ZQbnI3YUU2ZzBKNklxMUYx?= =?utf-8?B?WU1lb04zTG9TQ2tVc09TK0phYTI3cHpjS2hiRExIWUlZYXpmWFdWMy9jSWNF?= =?utf-8?B?L3ZzWS9yWjhxeS83VmRZTWpUcEZKenZYWXlqVSt4MndjdFdHcTVJTmVLcGJY?= =?utf-8?B?Y3ZsMC9wUGRDWHhOUHErbGIyRE96eHppb2xlekFaZStkd2RLNFFXN29tQnM1?= =?utf-8?B?dmkxa1YvRUlzRUhUanU5aFI0YXJTMVFKcHVKazZ2c1hQUTRzWWhUM2N3Q2pX?= =?utf-8?B?akxrZDdURGxXOFYyV3VidGh1ZVZadUlCdFZVL3JXa0ZuZG1Tc0doTlBXV2lS?= =?utf-8?B?SlUySW5NbjBTeWtMUlVOWTZ0NlpPTlQ1a2U1YnlaUk5JaXJ5QnBvdnNSd1Qz?= =?utf-8?B?Q2I2WVJDdVJLTzRnZXZnTU1xRHZSaU5pVWJUVlRDbEg2SkFxREo1TkdCZUlx?= =?utf-8?B?VFdwWHhoRjJsWjBYL1BUdEpidXI5djJuYkxIYWRHay80dFNiYUZxUlNNbVhM?= =?utf-8?B?SHd0RVBlTHJBcFBnUUllUmRxbXpzQkdhL3lqa0xrang3cHNvaGRxc28reVVE?= =?utf-8?B?czFhOThQK1hBaW1oSHBVT2hYakZxN1Zsc2Fudk9FakM0UEhPVGlGb1YzTE16?= =?utf-8?B?QnE0SGJlS1dEMVJiUmprSjVoa0dHM2RuMXliOHZCWDI3blU1M3o0YWYvakg4?= =?utf-8?B?VVFaMmVQUDVVREJhY3Q4SEw4Q0IwMWdjaUxWb2RPUTcwL054SU9WVnFnQ2tI?= =?utf-8?B?b0xOdndSOFRBVWEyaGk4ZlBwa0dYVUc0YWdjd0hxUTJuYVoyQT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1fd0434-f3e0-4705-2089-08d9f1061f98 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2022 04:38:05.6014 (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: AS8PR03MB7093 Subject: Re: [FFmpeg-devel] [PATCH 1/3] avfilter: Rename blend_modes.c -> blend_modes_template.c 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: Michael Niedermayer: > This is more consistent with similar usage > > Signed-off-by: Michael Niedermayer > --- > .../{blend_modes.c => blend_modes_template.c} | 0 > libavfilter/vf_blend.c | 14 +++++++------- > 2 files changed, 7 insertions(+), 7 deletions(-) > rename libavfilter/{blend_modes.c => blend_modes_template.c} (100%) > > diff --git a/libavfilter/blend_modes.c b/libavfilter/blend_modes_template.c > similarity index 100% > rename from libavfilter/blend_modes.c > rename to libavfilter/blend_modes_template.c > diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c > index 2d433e439f..e912ba4cb8 100644 > --- a/libavfilter/vf_blend.c > +++ b/libavfilter/vf_blend.c > @@ -34,31 +34,31 @@ > #define BOTTOM 1 > > #define DEPTH 8 > -#include "blend_modes.c" > +#include "blend_modes_template.c" > > #undef DEPTH > #define DEPTH 9 > -#include "blend_modes.c" > +#include "blend_modes_template.c" > > #undef DEPTH > #define DEPTH 10 > -#include "blend_modes.c" > +#include "blend_modes_template.c" > > #undef DEPTH > #define DEPTH 12 > -#include "blend_modes.c" > +#include "blend_modes_template.c" > > #undef DEPTH > #define DEPTH 14 > -#include "blend_modes.c" > +#include "blend_modes_template.c" > > #undef DEPTH > #define DEPTH 16 > -#include "blend_modes.c" > +#include "blend_modes_template.c" > > #undef DEPTH > #define DEPTH 32 > -#include "blend_modes.c" > +#include "blend_modes_template.c" > > typedef struct BlendContext { > const AVClass *class; Right now make's vf_blend.d contains an entry src/libavfilter/blend_modes.c; if one applies this patch, said file does no longer exist and make errors out with "No rule to make target 'src/libavfilter/blend_modes.c', needed by 'libavfilter/vf_blend.o'.", because the blend_modes.c prerequisite can't be made. In 3044d0efee9136c19dfdcf6dcdf957e910a73fd5 I made the build process treat templates just like headers so that they can be deleted without this error. Would there be any negative side-effects of doing the same for all files? (Btw: The AC-3 decoder also uses a misnamed template; I didn't fix it because of the aforementioned issue.) - Andreas _______________________________________________ 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".