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 101964BC6B for <ffmpegdev@gitmailbox.com>; Sat, 29 Mar 2025 23:30:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 354B0687C9F; Sun, 30 Mar 2025 01:30:27 +0200 (EET) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51514687BB6 for <ffmpeg-devel@ffmpeg.org>; Sun, 30 Mar 2025 01:30:21 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9E134433D6 for <ffmpeg-devel@ffmpeg.org>; Sat, 29 Mar 2025 23:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1743291020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N1AdUf1sbb5rFkf7wXu4Zu+VMB+4EuEZnciIar14ZaQ=; b=Fxb0Cb3QRrIMFFQnY4q9yfX/gluWT1gOktrMhsqJEHEwvXaxe3ddotMNtKQPyQExuUFNo5 jWSD/YGSzrSSKQrZQ+YJSi4AfsTQPN1lReHC5PU/ajf8ZenHTrThvJiuOMSRnWoL3tpP+X x5K15gVi7Yfk8wrVBbMkKYorxgmDipHlc+0OT9Age5FhHc7LqCiWCmGd4Eyu6JZGVqhbZb wuCNJ5pgb/nsh1CVogpbmtgEgIJihDP/ooirvnxp48GRUcXGZ5+Pk/rFTKww6x7KzdvyVU YQ0+xi4oLKMCeD/m3eBftC8imO//jM71Za/CeuZysoV/I49nsv0YUZoKN8CSnA== Date: Sun, 30 Mar 2025 00:30:19 +0100 From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Message-ID: <20250329233019.GT4991@pb2> 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> MIME-Version: 1.0 In-Reply-To: <DM8P223MB0365D63B64285CDA31B0DE9FBAA32@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM> X-GND-State: clean X-GND-Score: -90 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeehgeelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculddutddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddunecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeejteefuddufeegveejffehiefhgedukeevgfefkeegjefgieeiteelueeiveegueenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeguddrieeirdeijedruddufeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeguddrieeirdeijedruddufedphhgvlhhopehlohgtrghlhhhoshhtpdhmrghilhhfrhhomhepmhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrgh X-GND-Sasl: michael@niedermayer.cc 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: multipart/mixed; boundary="===============4898768215140441720==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250329233019.GT4991@pb2/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> --===============4898768215140441720== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="KXnFsGtgijfZ1q9N" Content-Disposition: inline --KXnFsGtgijfZ1q9N Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi On Sat, Mar 29, 2025 at 01:45:38AM +0000, softworkz . wrote: >=20 >=20 > > -----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 > >=20 > > Hi > >=20 > > 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 > >=20 > > 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) > >=20 > > 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 > >=20 > > 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) > >=20 > > 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 > >=20 > > 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 >=20 > Hi Michael, >=20 > I suppose you haven't looked at the video. What it is showing are conflic= ts 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 additio= n can create large conflicting blocks (many lines). This is what I'm talkin= g 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 annoyan= ce than API adaptions. >=20 > It's not quite clear why it happens, maybe it has something to do with ho= w Git identifies the context areas of changes. I'm wondering whether it cou= ld handle it better if there were one or two blank lines in-between..? 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 git merge is widely used in project MUCH bigger than our codebase thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB During times of universal deceit, telling the truth becomes a revolutionary act. -- George Orwell --KXnFsGtgijfZ1q9N Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZ+iCiAAKCRBhHseHBAsP qwsrAJsFPXEY74rh3USkJJyV+h8jkkWkcwCcCrGYSQ0iVkTK23qL7cJVuDoaTBo= =xt0h -----END PGP SIGNATURE----- --KXnFsGtgijfZ1q9N-- --===============4898768215140441720== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============4898768215140441720==--