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 6B0534AE97 for <ffmpegdev@gitmailbox.com>; Sun, 30 Mar 2025 22:24:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 551F8687CA2; Mon, 31 Mar 2025 01:24:05 +0300 (EEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10olkn2092.outbound.protection.outlook.com [40.92.42.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF344687BE4 for <ffmpeg-devel@ffmpeg.org>; Mon, 31 Mar 2025 01:23:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KLhecF5elrZr4rKdrOGS27QuoGk/lqWBfK9+ikf0DxWn8ze+c8sQ4bcjP4MWEzJgjyY9rupEXhawRTN9Y6cqeDBBbaetO3QmIkOjqb8C/JqP+Ux+nvGo7YvHpiRwKWUcmgxbODe6NaeOUQ/yGewyJIj0Q1qpfz6u+tf5lRNbTpHq8k4gPrgYwrGV8nVJdJMtpwQrhbyVAX37OvzuR/cnnY1dkyczoFqZ60NXK/y9o9U1xouOGAB4ggi+8Cxc6nsNounsK/ZhonzPGuJtClPsv17WVNxEDg3Fza1YQIRVDRiaWHv9PkdDNXJhzfnoY3MiZ/pkECaqdyPcYszknh1OVA== 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=E9JywVIW0BevWKy9Lil6i16IEdlzPWEQ9I2RvkGDPzI=; b=BdkgxX1QIFhL+M5p7NdwwJSn0o32ALCP2Jt6U1UTRTpO1SmHBjK9dw8UND+gdKAGjWnadTmYJpXB5dBlpf5rOy7AWOs1ttIj8djGkp8pppWomtU+ra8Uy2d6P4iGzv7NTajeckuk+pPNzdmGOL9rC2Ejsa1QkhAQza0LjZoFlEZ72wIPIMeqoL/7OCoyPiHxo/r04Fp+YLVLfrVBuEQfMCIENw2X6yLfMn6cBua3HFD0KxV0lAS/mGU+1Y9Dc1DGf86KA2gzvRe2JNAY5q4cKaxmel3BcYYTUT5n4pt8iN6RsA2xVLHVnY5/oL4NcgZ6R14Ow7okltUxKOyhze63qA== 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=E9JywVIW0BevWKy9Lil6i16IEdlzPWEQ9I2RvkGDPzI=; b=CjbjUqMCj8TfBA98Kow6hTcOZEtYi7VR1EBYuiBUgVrMPFnG5N7bZtM2QxD5EyWUNpTM4t0auRhgQzXsOz/ocdmhbHHVKof/IvVcrDJqmN8mSjxYkW3VPLzys98NkN5aC+1Zg6cvhJ0EBvl76e0BgD1NMiB2Z/i1K44KQqjt9XM1eihfcgBqko7OPFAbvZDBpOq+GZAcmrCcPVmSdekagwgPWN86yYHDl7nPMI0uNja2/sesHU+OFNyX0uBJ/f+fThoL8QTwuWvOardO+Hu5jy0XpvhlrOWf4SzWH3fBQR5+plccM8iVYDPdiUdt2nM1UJ0cjkF6AopNZFgyKRKMhA== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by CH0P223MB0073.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8583.38; Sun, 30 Mar 2025 22:23:55 +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.8583.036; Sun, 30 Mar 2025 22:23:54 +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/4IAAMq2AgAADyUCAAXDggIAADVvQgAFinQCAAAc+IA== Date: Sun, 30 Mar 2025 22:23:54 +0000 Message-ID: <DM8P223MB03653F35C2B9719104948D00BAA22@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> <DM8P223MB03653C8B70C142CC64E79777BAA22@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM> <20250330212720.GC4991@pb2> In-Reply-To: <20250330212720.GC4991@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_|CH0P223MB0073:EE_ x-ms-office365-filtering-correlation-id: acc8e5d4-f319-420a-170b-08dd6fd98ea3 x-microsoft-antispam: BCL:0; ARA:14566002|19110799003|8062599003|8060799006|7092599003|15080799006|461199028|10035399004|440099028|4302099013|3412199025|12091999003|102099032|1602099012; x-microsoft-antispam-message-info: =?iso-8859-1?Q?W1gntCDuImNBuPyU9DQiaIx3rictmaSMYjf8xS9G5apP9EIpIpbing2yqV?= =?iso-8859-1?Q?WhUGecbuxcWgOslkHHXCkIiDNKOX1uNOic1ma9APjplTa4Telzoi5Y00i4?= =?iso-8859-1?Q?J8tIjzeSFTMwmqY+Srk4jDX9gsUFTHMZYHjN+gy4fxQEs/Q0YU3tNe2Uqt?= =?iso-8859-1?Q?L0k2Ce7CpHFSRp2dZCfwoBC097AwV1uM93qtLAU6lO0DSDvoZveYj5Fd8p?= =?iso-8859-1?Q?UdgXXHMpgz2VZNW+4EZeqRWBgAun/KRC08dYOErUQNfHy1cHnk8d3byYlo?= =?iso-8859-1?Q?oIEywK8pEpqK14mkM7hfJi9gxhJsq0qLpOJWziI0dudUIuQCqeqnRn5P2y?= =?iso-8859-1?Q?Q4KiRcyPRs5qdEjSVWtgOJVrGoS5S8VnuKqpgWM+kC/Tz0Fv3+eAPPhS+g?= =?iso-8859-1?Q?F2qQsUzS4N6aXJAZsQzbTfB/Vj6LgoWDZNPJoO09yeju+/qYnAvALvcKD/?= =?iso-8859-1?Q?YaBKqhkw/IqSlSY9Ibd8sm7MtIt73WHUayy35FELXjE95c+DWia/8RJrfZ?= =?iso-8859-1?Q?aN7ZF0DoQ9g2u8Q6CyaxL3wmKtJ/Vrq+4XoWe3AYk44hF4+CTO4kBFoZBP?= =?iso-8859-1?Q?gC12mmVXjX7nFqNXbzPSw5ljl0PBVGrNyx92GVgj2tZU9/42seYXdFTgOM?= =?iso-8859-1?Q?Q/h8u3dtZ7mD4jCb8pJTF190XZc60wfDAgzi/mNBOX/KcxlZjAQR0V5ov/?= =?iso-8859-1?Q?tvq3HF7EG5H0NJvVgTG8XalcL+rYrCa7fvhQY9XW1kXcg+o2InIFdtH8PL?= =?iso-8859-1?Q?kA5T86T9rX5GVXZ9gb6XNnqRq6wOlAvrvU7Zs7FqVn7/xb9ghdfEWoaGqN?= =?iso-8859-1?Q?LSv54Y3tGrY0/B2rzvFgU9E7mLQbyKmRkR0ish34KeDA2kYyMvA1o6TxMT?= =?iso-8859-1?Q?SycpjZ35QW0TYl+Hkzau5BCjrTrqWzsYw3Bw6JaGpj4JXNUoXWFIYBXq7E?= =?iso-8859-1?Q?QHu3dJEsWl2tZEKrJvfk2S8ZuTWnUQ1iaAjyktLbVWYCTb9znHNuwRR/7p?= =?iso-8859-1?Q?s9jxNaecs/Jzr7r+lTFk/4fEg8cU+14n9ASSB0tYCNMqOdm99EZwuXC4cA?= =?iso-8859-1?Q?chCnemTrsSKhMvnQxGj1hE7X8S6lGV8yNffEx8FxhzgiKKemadR3diMs1Y?= =?iso-8859-1?Q?5g1xY7/WhgbsUXa+2rXhhGDNevJ/jtRWgcPImPtrqZeC92cEEvuFXPWcwV?= =?iso-8859-1?Q?vUGaD+Tn8IcwalOHaHZlyZ0xWQWFJ/D3o0G2ZAmN/3TeWp4IOkquV66xkn?= =?iso-8859-1?Q?V9JBiZtCZ9oTqgTo2sfwsv9Za9258DKkwRUkRN44BgswAakghVZvKzgN/S?= =?iso-8859-1?Q?anHB?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?9wqtCRiJ5qJo1YHJoQE3u5faHmKHgdxwvUH9tYakjfWvycjD6P0BPFwaKQ?= =?iso-8859-1?Q?QrZ7vWctsSLkDwi4Q+rnkb+dWwuEw2y7PpXkajiL3usWu4kK+LtZvCm7S3?= =?iso-8859-1?Q?Mfq6KCzAoRg6pqufjBwLPiGeFnfGVWii5A84sO9pFYFdNQDDwBtY45EgZM?= =?iso-8859-1?Q?soTdUrOsDVQf1VD3hvb5FHZibL+sO4+EFMetWJju1xW8JIwDFmWpN5u1dw?= =?iso-8859-1?Q?hWkO9+g09tvFL19VsbTr+kYKSqAPFcJcakgnQdajMdgZnfplo6/N+v8GiY?= =?iso-8859-1?Q?lz7KBNCu7lKXe/9t8EKgL/qMU4NnGjgEjsuiyPC9me9cAthBB3H+e9pv20?= =?iso-8859-1?Q?gFCN0Fg00o7K1ENFOZU/bJw/5T0jdOk1tk1kgCJ72E/tnxPv3jr22MuUb9?= =?iso-8859-1?Q?baBz6+iija/RPo+/RjIpU9ADpvJ8bUGOisAJudUZyciNUizbkYxSN3ERv4?= =?iso-8859-1?Q?TM1um6XM9za6dEXRHvROL96I3uiufQS0gnFsEh1lhI1FRvjdVjA+7KOYLY?= =?iso-8859-1?Q?m+toeyQxtHABPz9JRFn+j3mutaS9k7KSz9JmlKZoqkKUq15J26BbH4cq55?= =?iso-8859-1?Q?vSSdfEK1a2D8MOKJpTWQC0FY5gdss5IgZ5HVw1nADvIvrUlKa68XJi1KOn?= =?iso-8859-1?Q?BpIdLH+w6m0GqOiBJB5KSuk8/1DPI17tkLhQUcDeU7qGy6J0jLCLWxq5X2?= =?iso-8859-1?Q?EuhB/spff1+UmROvY33vbfwNqqjeP+ftJ68iUF7BVguchxPq9PZjV5CbYI?= =?iso-8859-1?Q?yYKtN0VzBczEJidyY7CywH6fcbZLHhi9Xu/Sy9gzSYoAI8k1N1jQCmFhsu?= =?iso-8859-1?Q?Uq+7b+IxkjEVfwxgaCpKd2Edmp5pKfZUzdISSe7U2cBHh/QQbsV3/6rU1F?= =?iso-8859-1?Q?JdOwFhiNpUXSXxYQyiCqrdtjS9pU6RWxAOMbS5qiBrEqKoTr3scLeTY3U5?= =?iso-8859-1?Q?YLDSkAIJUDQHLRQMBKPePHoC7ZQP9KUKy+V4NjJKgV/AzGR7/MNNzvCUyv?= =?iso-8859-1?Q?DtRCTvfmphhlRfmyyExN88lMXgavca4m9flyE5t7Ggn9S/aiHY3k7CJOqF?= =?iso-8859-1?Q?8M4Kby1VGKE7tHmrsTBVAnpS/hXXd7PLeNbpKXXP9pjU1ZK7bdYL1mYOR1?= =?iso-8859-1?Q?MQG5iyZZJraG2qWU5DMwGzhtvhKzM4YBzYlN7JUSSBP/5W0RdBULWV5XOC?= =?iso-8859-1?Q?gqXyZ0JB2fhFqPs1mHlJoFGzfDKaNZwZpurgPILOSzcsCVZyxqEZR6jN3j?= =?iso-8859-1?Q?DsyGTfLfmIgl3TyUpgbmcFT+wu9wlqFynpjHDmQUo=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: acc8e5d4-f319-420a-170b-08dd6fd98ea3 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Mar 2025 22:23:54.7696 (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: CH0P223MB0073 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/DM8P223MB03653F35C2B9719104948D00BAA22@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 23:27 > 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 Sun, Mar 30, 2025 at 12:51:46AM +0000, softworkz . wrote: > [...] > > When the branch to merge has the same baseline with only the > additional commits 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 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. > = > = > > > > > > > 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 > = > 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 Hi Michael, git merge is better for those single-line changes in allfilters but it can = include unwanted changes as well. Another example, avoiding the API changes: git checkout refs/tags/n7.2-dev git switch -c b_n7_7_dev git merge 7dbb6890f2eb6035eb9123ce2039f6dbbc082b3d still causes a conflict in configure. Even though the commit is from a non-diverged branch (https://github.com/softworkz/FFmpeg/tree/add_filter_test) 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".