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 8BF364AE13 for <ffmpegdev@gitmailbox.com>; Sun, 30 Mar 2025 21:27:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 123A4687C94; Mon, 31 Mar 2025 00:27:28 +0300 (EEST) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D88DC687A8C for <ffmpeg-devel@ffmpeg.org>; Mon, 31 Mar 2025 00:27:21 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3F2B142E79 for <ffmpeg-devel@ffmpeg.org>; Sun, 30 Mar 2025 21:27:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1743370041; 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=PKpIzrsnaH9F/mb5e7uGTrKMTtuRA1n8O6FTMsw/tmI=; b=UKj+KVyeruO2j9ow0a7lXCidqD/m8ziBVyK6KQDFnwawTCEq+uM8jDQZuEi8ZsxEUQtmAO 8xqXBzpVFWTOyEyZgpEeSmExYwnfl9flO8t9z9GLxX3cnEW+BewdRsvyAIaVAWsHeAkUnl /24SAtVveRBsJWonLZXDFVueKZ+Mn9wLLkVbhLwwXiO88gGdv4QOm1WJ04KMATcJ3GQZrn xTxV7BBC3UwSfqYVmfrH5sdwUYIAdh+L/I4Vb0WcBhdDXwCwI3JM/yJZTXlH9ZRmUBG3SN MU1wxx7TkwlUV3wEyijk1Fiu/Jv+VyTbSnw0vQXEUnJIb9efvv+lWgQGmYhw6g== Date: Sun, 30 Mar 2025 23:27:20 +0200 From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Message-ID: <20250330212720.GC4991@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> <20250329233019.GT4991@pb2> <DM8P223MB03653C8B70C142CC64E79777BAA22@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM> MIME-Version: 1.0 In-Reply-To: <DM8P223MB03653C8B70C142CC64E79777BAA22@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM> X-GND-State: clean X-GND-Score: -90 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeekuddvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculddutddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeffteefleehieeitdffueeuvdeuleduteeujeduffejiefgvdejgfeftdduvddvvdenucffohhmrghinhepfhhfmhhpvghgrdhorhhgpdhgihhthhhusgdrtghomhenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg 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="===============4759668003175145236==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250330212720.GC4991@pb2/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> --===============4759668003175145236== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="1e7HAQZealOQF9YZ" Content-Disposition: inline --1e7HAQZealOQF9YZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi On Sun, Mar 30, 2025 at 12:51:46AM +0000, softworkz . wrote: [...] > When the branch to merge has the same baseline with only the additional c= ommits on top it works fine of course. That's equivalent to the patchsets o= n 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= ahead of a stable branch and merge it finally into stable. > But merging something from an older and possible diverged baseline on top= of a newer baseline is a different story. The key word here is diverged. between mainline and the module branch is a common ancestor mainline has of course moved forward from the ancestor and the module branch contains the module and its dependancies between the ancestor and its HEAD. Thats how it should look. What you suggest is, there is something additional on the module branch. That is not possible nor will it work. For every system, the modules must be kept free of conflicting changes. >=20 >=20 > > 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 >=20 >=20 > Sure: >=20 >=20 > git clone https://git.ffmpeg.org/ffmpeg.git >=20 > cd ffmpeg >=20 > git checkout master >=20 > git remote add softworkz https://github.com/softworkz/FFmpeg >=20 > git fetch softworkz >=20 > # Test 1 > git cherry-pick 39bb78e449a1df67ed5b3b0fafa86af7e115cb36 I suggested "git merge" not cherry pick splitcc is added into doc/filters.texi into a section you added in prior commits which have not been picked git merge 39bb78e449a1df67ed5b3b0fafa86af7e115cb36 in fact merges doc/filters.texi successfully while cherry pick fails (other unrelated commits cause conflicts in other files but these would not be part of any "external module") the same happens with libavfilter/Makefile git merge cleanly merges it, cherry pick fails in allfilters.c case theres a API change (FFFilter/AVFilter) thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB When the tyrant has disposed of foreign enemies by conquest or treaty, and there is nothing more to fear from them, then he is always stirring up some war or other, in order that the people may require a leader. -- Plato --1e7HAQZealOQF9YZ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZ+m3NAAKCRBhHseHBAsP q9LJAJ4+0u55KAjfnmG4MimnVoCudAaSzwCfb5Dfo7KoLGjq/3EfVnEfErNfVvw= =x1ag -----END PGP SIGNATURE----- --1e7HAQZealOQF9YZ-- --===============4759668003175145236== 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". --===============4759668003175145236==--