From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B2FFC4D6D2 for ; Sun, 1 Jun 2025 17:13:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2798868D61A; Sun, 1 Jun 2025 20:13:03 +0300 (EEST) Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C2B9368D450 for ; Sun, 1 Jun 2025 20:12:56 +0300 (EEST) Received: by mail-yb1-f174.google.com with SMTP id 3f1490d57ef6-e812fc35985so662099276.0 for ; Sun, 01 Jun 2025 10:12:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748797975; x=1749402775; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XRFKWIsqfyo04BbTD24srvlQN7PeuNR0IoRcXgrD/Qc=; b=vWENmkQUUORAz+0oTa/xX8ko5p6PjVRWByf9//dTsmQHvgxnpvmc+YwyfFy1bMO61k b46IoQBElJ6mck3LHnlcMYB19VYQa/wuMrrTRSrEWqRC8sKtbGei6bGorn92vljAMxbZ Nmws3vJeb3JyqvEHiPg04pzwOIRcigmY7XvCi7eE4MDVruvZFpvOycLxtWfp3SDq70gw 4xt3o/CxUxyARRMYP79PABFy6Uvb2vAn3QV92Ks38FUBrNsK9jfDx8L5b0LDKRIZD/yl N00sB7UWh4QmxQ7QeQQBomensDws0BbH5lo0NoxvV226GwbUHeRnMUKwuR9IVkLAfh+M ZkRQ== X-Gm-Message-State: AOJu0Yxz4RZcNyvRKdfHHC4cfiJvvPl9Imw1JiegGIkDKWoKJ09OYT7b 1C5JgVJ0+TQydFNSTDkMaSw/d6+9+OpPzMQeoAy6paVntHeMF+VXC1uX5pozfv5TzALex8GNDW0 2DDXyW9QM+ajjfjuSnm2eB2m9KHkOluzWlw== X-Gm-Gg: ASbGncsi/Wd0//O1YT8J4YpETvaMRzv5oIkcxuz3M/SudbsHa9uQ/gSpAAvyJPxBg1+ 5JG7MU6VJP9UB51nqHh8dGCe+cEJSjG9IFUwInt2UpITgV73YA12VQ2JY+AwxqN/LdtARkTIEPZ cE56T8GE//BfHTULJWP4yBWwhC/NHjemD5 X-Google-Smtp-Source: AGHT+IFEcsSXAs+pV3qvF9p4lbGq1esI5ARFBYPSmcTRQEvfDgwfd+vklh0/L/hfDWWUpOsiYVmE7VxNvFEBmC+NG9M= X-Received: by 2002:a05:690c:3349:b0:70f:6ec6:62b3 with SMTP id 00721157ae682-70f97f13a3fmr164424057b3.26.1748797975069; Sun, 01 Jun 2025 10:12:55 -0700 (PDT) MIME-Version: 1.0 References: <20250601152222.GU29660@pb2> In-Reply-To: <20250601152222.GU29660@pb2> Date: Sun, 1 Jun 2025 18:12:43 +0100 X-Gm-Features: AX0GCFsG6rqb_psI66GwVwsDsjiI3PXWMLeti0igCw25UTlnRcacig5TAyk-wX8 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [RFC] Cherry picks vs merges 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: , From: Kieran Kunhya via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Kieran Kunhya 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: On Sun, 1 Jun 2025, 16:22 Michael Niedermayer, wrote: > Hi all > > almpeg is now merged upto 1 months ago. (and since last merge it contains > bits of AGPL code) > > The question now is, how does the community want to proceed from here? > > I think there are mainly 2 options > > 1. People review almpeg/master, fix any issues they want fixed, change > anything > they want changed and then we just "git merge" it. > > 2a. People cherry pick individual commits one by one and or diff between > almpeg and mainline and post these for review like any other patches > 2b. People review these patches > 2c. patches or almpeg is updated according to reviews and this is repeated > until everyone is happy > 2d. patches are applied to mainline and the diff between almpeg and > mainline > decreases. (so one can always consider diff hunks to be things that > need > to be worked on either update almpeg to mainline or mainline to almpeg) > > I do intend to post a small set of patches from almpeg so we can > see how the cherry picking style method would work. > How merging would look you can basically see in almpeg/master already > > Into which of the 2 options would you be more eager to put your time? > (I think it really matters where you want to put your time not so > much where you want others to put their time ...) > > PS: also theres STF, is someone interrested in doing more patch reviews > when it > is payed ? If so, say something, i think we either way need more reviewers > and > STF would be one way to incentivize more reviewing > > PS2: yes we can vote about cherry pick vs merge if people want but i > suspect > its more a question about will and time than vote. > Librempeg has this licence statement: All Librempeg modifications, and any new files not available in FFmpeg, are licensed under GPL v2, unless stated otherwise. So how do you plan to merge? Kieran > _______________________________________________ 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".