From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 7CCFC4BCCF for <ffmpegdev@gitmailbox.com>; Sun, 30 Mar 2025 00:52:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DA9B687CA8; Sun, 30 Mar 2025 02:51:59 +0200 (EET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04olkn2057.outbound.protection.outlook.com [40.92.46.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A129F687C00 for <ffmpeg-devel@ffmpeg.org>; Sun, 30 Mar 2025 02:51:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UigKA6+xo5z/bDwkds/7Ahun9aQq/1xWVJKkVvtCu0ZCXXax9wpf9Q6oh9Y4nuElH0mw7XPj38fsUua6RX8V5uj7yaUo1oNe1i70h/IcumVo2Lb6VhGE5w8lrSszonxN7mguOST9qf4DVFYFziU0eCz2oBiyGxtWAkHE/KjAkC2X0RPgOb5kT4Kd2I0NvHut1TZjcmNcq/MSodH0+g+MHwQqFvrIsA7iddp/grA7IxVyl1KgdnPfE5G2qp8CVuEZ1ym40Cjn4LkASqTkLWRj2BVnITurTNLRcKFEFNdFGzTjCe8ys0ifLfvVLyQLENexQ+YiOJdD/6qrQ834pSnwiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=51nMf43MpbFKsq1HRyKYbPiM689kKipKwpDCMCvmJv8=; b=eMUrfMuwyA/hdg69zJczmnGyaSnkffr6ERZSsQioUKBefv4jAnirAcJtqrfdtt2Abte0BC+YbjgZzviWo5oEsEWOs+EhxEwDCwWTYQtQFRKFKkbZpvmBVCpuOrzbDluIGKIGRaf5XvyB3oWOAjHXQ2/kzS6O1R/zZeleyhLLNmJ4jgpK09DriqLIqdvyydiIydWfW9dLeCrZgZxIbB04dq5XuIMwCN/ZqvJbzUBwo5pQSKbJ6EechreHGStxPJwdxGkg4GdN8Tw2oPdjjcHJSwUN/VSfy4GmrGQDmHKFg8hsUxpIGM4AMPmwJkarlO4e08kt6RCe9B25WSWfzKFlpA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=51nMf43MpbFKsq1HRyKYbPiM689kKipKwpDCMCvmJv8=; b=jbulk8qswECNLStO4QaJlwZrsC80YJHHJ4CME3De6i1Yyk3JIT9WayMeXQuJ8nCF3Fe7QKycBuTI1eVfRILBfOTtSITv86DeetAYZifoEh2B87JgNIRU6q9ZOJ6haxm+bNDR0GeN9Ff0620CQgsb4AbAObJq3D4ZcV+VpvuSguJlAIGFPqVsAT6jbCMexvzP/bBKHEt+beOBUmJe+HEq6Esx9YaPnzdUV86eWqEd4qfbPyd9CajdnJAQgSfyXvuhEQnkpYonmsHZwYa/n1Z/DPlCsxN5DQYnbamVNPufPWh9NE3daUopk8md+VWAL8r3niel/P98auXiUcJAaU24bg== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by IA4P223MB1763.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:55f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8583.29; Sun, 30 Mar 2025 00:51:46 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::bf09:8e9:b07f:98a7]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::bf09:8e9:b07f:98a7%7]) with mapi id 15.20.8534.043; Sun, 30 Mar 2025 00:51:46 +0000 From: "softworkz ." <softworkz-at-hotmail.com@ffmpeg.org> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Thread-Topic: [FFmpeg-devel] [PATCH] avfilter: Proof of Concept: enable out-of-tree filters Thread-Index: AQHbnNVMcLTH7PoeaUW9fwrAaAoOI7OCd4YAgAaiSwCAAAo/4IAAMq2AgAADyUCAAXDggIAADVvQ Date: Sun, 30 Mar 2025 00:51:46 +0000 Message-ID: <DM8P223MB03653C8B70C142CC64E79777BAA22@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM> References: <6bef7ee3-6e0b-496a-9018-ce02d5e8cd63@gmail.com> <2477728b-6217-446a-9a15-830f028baea0@gmail.com> <8bdfe841-080b-49f6-913b-7577d03a1214@gmail.com> <20250328213828.GI4991@pb2> <DM8P223MB03659FC57B4DB3C93E6BACF7BAA02@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM> <20250329011631.GP4991@pb2> <DM8P223MB0365D63B64285CDA31B0DE9FBAA32@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM> <20250329233019.GT4991@pb2> In-Reply-To: <20250329233019.GT4991@pb2> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM8P223MB0365:EE_|IA4P223MB1763:EE_ x-ms-office365-filtering-correlation-id: 3bb67813-05f1-4bf3-d5b7-08dd6f250c45 x-microsoft-antispam: BCL:0; ARA:14566002|19110799003|8062599003|8060799006|15080799006|7092599003|461199028|10035399004|4302099013|440099028|3412199025|102099032|1602099012; x-microsoft-antispam-message-info: =?iso-8859-1?Q?B5d2RLtiRJ0xhPsGgwkGxp/spDDyJA614oVIaK8nq2QOAiGeSJF7h4X3CQ?= =?iso-8859-1?Q?rPdqI7YkfWThMcJa7bZBM5Mzr6RhbaVo6sBAI2Usq6RbvPowiURkJszjS3?= =?iso-8859-1?Q?9sfbUcSlSX/EnUXxS4NNQIRpY36IL0AXgn6NKLDoaLMd3pV+xH78AWq6EI?= =?iso-8859-1?Q?FfI9E6z1toOboCGUuUSgA2qRKnEFasFf8FL4TvjOXmKoVghKIRxcccrBnU?= =?iso-8859-1?Q?Lk0WhgE/VfZgWoeLl/Fk7h+q2QFe8DtSCAy+i8Kn0LfLN6h1tMH8e1U7Jo?= =?iso-8859-1?Q?gfCtmRrQ0gSKg3PKW6/hCE0gZdhlvkykUaeZW85wbmvCJzyqdFT19NDFOd?= =?iso-8859-1?Q?/Q2XdSullYXM3KVrJSDLkQ/btsZK8+ABg2Bt2wdTq5pqmsBzDwvxYzWA8h?= =?iso-8859-1?Q?VGlY7ZCmrhH2UHM9j65j5BMQOi57/u76mYgKTSgR0AJvEC0INoUsf6boGT?= =?iso-8859-1?Q?T0ogWssQ0SCg9RW8BDLS/xm/KyXFmorAKz2KcCbzft4Fc2YkJFcwcChrOn?= =?iso-8859-1?Q?zc4+l5q2VXw9weChN3BEfEt/jPJ+RpbUZu9bAZXc6NhM/4sZMHGh4LOkWu?= =?iso-8859-1?Q?lZI+QcG0O/syvU1pS1Egfx1YkOgXDRr1b5gdsXGbdpEvpjJALt0Y6GQmMl?= =?iso-8859-1?Q?sKMbrrd4sstRW0CtKm9KUpKyz4xhyuKDWKvgWpiL6+CJnCj/5WFnoHUkxP?= =?iso-8859-1?Q?T6h+mMznp/gedIht8c2lQ+p0/BM670JgQxNeCBhszeXF1zsT5wC7xoqmRk?= =?iso-8859-1?Q?QMOoz1YtTxTd3KhH/aKAkT7/eaOyS6iBU/broNRgC4dk9PyVZDEolRl3bs?= =?iso-8859-1?Q?y36Rrh2CmWy07Mgouz2gzHCUFC443b6An4tSEWMH25nJ5cBd2wT5zCFZMu?= =?iso-8859-1?Q?vNmeotSg15mOZe+WFmQIraDIsrz048dvvuzjt11rop8PIfZ0S6aTknjj+U?= =?iso-8859-1?Q?5mpn8Prokijj5YOH8F2XiIdcK0eCp5rCkryOJZr9Ws0oDh/l8Fn4NKpupl?= =?iso-8859-1?Q?NBLsZKJXR8xvajeRdj3bIwZSrQFrBfo1QHlvoV0Jm2nasKpKR2I9Napzea?= =?iso-8859-1?Q?qbv84LvpBYsd40vJwKaWp1uOvBlkJ4zAq0Y5iyvs+GYRfEmxOWbdaYOpeo?= =?iso-8859-1?Q?S7/MUd6qTaQMzeIIXVuM4RBmWwKhqJ4Mnau8MEDESAqm4SZXzkUpp572wS?= =?iso-8859-1?Q?2XTVH4QqQ8I8BhiF7z1Hhjgz/S/7zq8Qlre2JULRrYPf10u8LMkAsQjvqX?= =?iso-8859-1?Q?ElN98gW2qwN53fomjVpokfZcIdNndO7qUFEYJTEfE=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?/2/8WdBiqoeGbtkeGwRvazOcstDaHK+q6+6p1wzNHFwusCCaY5Cu+m6OnJ?= =?iso-8859-1?Q?rIQ1hAPofE3S31u09lAUXisFEJyB0muyQIApJy2KBM2X5BoCJbD3M1QJ5Q?= =?iso-8859-1?Q?AEGSCm4k2EIHyzK0NGsrGjjT+fSHssL4Y/yexvdTUmXtBvHWB3F9DosJDP?= =?iso-8859-1?Q?IgGN81tslKJ+nY7Aaaeyaoe8IWTBFw8oRLPEAQL2ZtBGG8fFYtEvOIAZXv?= =?iso-8859-1?Q?dkpvX1G5+SRQXOYNx3seQqet/JwxGejH222k0SwlPfY9w0WzNAk9wUo0uP?= =?iso-8859-1?Q?EQveJF6tz5nuAFERxr8mzzLnY1T13BWAgVCy95pSQ1VgxaNUd/7/Z7mSA/?= =?iso-8859-1?Q?ymD8ruQY66odOxW/fzggzu5UJV3JVEI2wjO8JrJwRMAmzNxojBdOgRJwE9?= =?iso-8859-1?Q?qhgUK55KYVmTI/GBWQFpOPkvDI8KfDiz8kczUxPoSTLaZXel27JmcYZC/d?= =?iso-8859-1?Q?8DQ+F+chqe1IqwdKzaq5W0SpS62Ml5GCUFug7bAwo+c/bI0NIxjQ4z3zJr?= =?iso-8859-1?Q?Ou3xEKZt2FcaPVzufORqrdrNxhqypE3ff3y9oqScuV9iEqslxLROEUG9Mr?= =?iso-8859-1?Q?edXjbSPCC939+5gtobMKMGxPiNfqpWx3KBaodxVSs2/mRvanHD9evtvwNh?= =?iso-8859-1?Q?RKcHnOCE4HCenz7Wp3ljwQPhCDhBtZBzAZ1df05SqHB4zH42yt/W4anVmg?= =?iso-8859-1?Q?NLczja/qAEKdS20fZQdHoUbnhC8a9TKGpqeYpyJg9Zq6Qv9E1dT3H+xR89?= =?iso-8859-1?Q?OweTVar6KeOnUFV1d5pCuoGAQnNHYYETNmBWdSUrp+duiIXhEn2hhiCVCw?= =?iso-8859-1?Q?wsImRv1KSlypSKckDo2WwOBWHqp92TvpjeTbjNn/ZvSPdVifImDT960+ZS?= =?iso-8859-1?Q?+A84DbRH9ttxC5N06h+B0zPGSYvhgwx0UarOeTD3+Tn9gh942gMXR18WD+?= =?iso-8859-1?Q?s8Wx6bEreQmQh4ZIcpEUaU6Af00sIhz8fhs3xOw857Sl8tEIzOYTixCuXQ?= =?iso-8859-1?Q?jf7dAgH4ejEyOIEPZTibgXMExXEChL/gTIBX0cfEfqamu+uE6SadaMg3o8?= =?iso-8859-1?Q?3q0pC3VR0j0CLnoqtlaYPf9Jw3FcDGyQ8z53vmT56XwsjtXjSUkU4+Yiy1?= =?iso-8859-1?Q?o17iXQ0K2KUz0Onxs+KHktZt/LuyBva4gdcT4VDKffunnsceKAuvMmPPNr?= =?iso-8859-1?Q?butVqx79C4C5uq03Ds/RyoPPXPS2dWWLoQI9/3J9pyUBXy0BUghm347eqk?= =?iso-8859-1?Q?2QGGGhJba1au391RlUSFR9aU36gCixapeJe/boTS4=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-92255.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 3bb67813-05f1-4bf3-d5b7-08dd6f250c45 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Mar 2025 00:51:46.6502 (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: IA4P223MB1763 Subject: Re: [FFmpeg-devel] [PATCH] avfilter: Proof of Concept: enable out-of-tree filters X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/DM8P223MB03653C8B70C142CC64E79777BAA22@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> > -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of > Michael Niedermayer > Sent: Sonntag, 30. M=E4rz 2025 00:30 > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH] avfilter: Proof of Concept: enable > out-of-tree filters > = > Hi > = > On Sat, Mar 29, 2025 at 01:45:38AM +0000, softworkz . wrote: > > > > > > > -----Original Message----- > > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of > > > Michael Niedermayer > > > Sent: Samstag, 29. M=E4rz 2025 02:17 > > > To: FFmpeg development discussions and patches <ffmpeg- > devel@ffmpeg.org> > > > Subject: Re: [FFmpeg-devel] [PATCH] avfilter: Proof of Concept: > enable > > > out-of-tree filters > > > > > > Hi > > > > > > On Fri, Mar 28, 2025 at 10:23:50PM +0000, softworkz . wrote: > > > [...] > > > > > > > > > > The advantage of "git merge" wether by hand or by a automated > tool > > > > > is that its not limited to what it can do. Its much more > powerfull > > > > > > > > Git merge only works when there's a common baseline and the only > > > difference is the filter commit on top that you want to merge. It > cannot > > > be used when there are different baselines, e.g. the filter is on > top of > > > a the latest master branch and you want to merge it into an older > > > (release) branch, as that would add all the differences, not just > the > > > filter. > > > > What you can do is cherry-picking the commit which adds the > filter, > > > but the bigger the differences of the baseline, the bigger the > problems > > > when cherry-picking. > > > > > > > > > > > > > and the changes outside adding the filter itself are very basic. > > > > > Conflicts are something that we can workaround in many ways if > they > > > > > become a problem > > > > > > > > The changes are basic in fact, but the trouble it is causing each > time > > > is beyond basic. > > > > > > > > To give you an idea of what I'm talking about I've recorded a > short > > > screencast to illustrate what I mean: > > > > > > > > https://gist.github.com/softworkz/750da15adb259fa13c6b32277647d54e > > > > > > Conflicts can only occur in areas belonging to more than one module > > > ATM, when adding a filter thats allfilters.c, Makefile, > doc/filters.text > > > and configure > > > (and very similar files for other things than filters) > > > > > > As nicolas suggested, if each filter is in its own directory no > conflict > > > is possible. > > > configure just needs to include the Makefile, doc/*.texi, > allwhatever.c > > > from each of these directories > > > > > > About merges and revission differences. > > > A filter for ffmpeg 2.0 will possibly not work with 1.0 (in the > currect > > > designs of using the internal API/ABI) > > > > > > So if you have a filter based on 1.0, one on 1.0.3 and one on 1.0.8 > > > and you merge these with the ffmpeg release 1.0.12 > > > you get exactly the right thing full automatically > > > > > > You can cherry pick too and the effect is about the same but if > filters > > > share a common component merging will likely be less conflicting > > > > Hi Michael, > > > > I suppose you haven't looked at the video. What it is showing are > conflicts in exactly all of those files where you think it would be easy > going for Git, but unfortunately that's not the case. Even a simple one- > line addition can create large conflicting blocks (many lines). This is > what I'm talking about and I've created that video because it's not what > you would expect to happen, but it happens all the time and it's often a > much bigger annoyance than API adaptions. > > > > It's not quite clear why it happens, maybe it has something to do with > how Git identifies the context areas of changes. I'm wondering whether > it could handle it better if there were one or two blank lines in- > between..? > = > = > git merge is widely used in project MUCH bigger than our codebase When the branch to merge has the same baseline with only the additional com= mits on top it works fine of course. That's equivalent to the patchsets on = the ML needing to be created against the master branch. It also works fine for larger merges like when you have a beta that's far a= head of a stable branch and merge it finally into stable. But merging somet= hing from an older and possible diverged baseline on top of a newer baselin= e is a different story. > can you show an example with command line git ? > like a simple sequence of commands that result in problems, that i can > replicate to look at what happens exactly Sure: git clone https://git.ffmpeg.org/ffmpeg.git cd ffmpeg git checkout master git remote add softworkz https://github.com/softworkz/FFmpeg git fetch softworkz # Test 1 git cherry-pick 39bb78e449a1df67ed5b3b0fafa86af7e115cb36 # Test 2 git cherry-pick --abort git cherry-pick 7dbb6890f2eb6035eb9123ce2039f6dbbc082b3d sw _______________________________________________ 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".