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 5BF914FC2F for ; Sat, 28 Jun 2025 18:02:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id C9ADC68DFB9; Sat, 28 Jun 2025 21:02:43 +0300 (EEST) Date: Sat, 28 Jun 2025 20:02:33 +0200 To: FFmpeg development discussions and patches References: <20250623201518.45827-1-derek.buitenhuis@gmail.com> In-Reply-To: <20250623201518.45827-1-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Message-ID: List-Id: FFmpeg development discussions and patches List-Post: From: Alexander Strasser via ffmpeg-devel Precedence: list Cc: Alexander Strasser , derek.buitenhuis@gmail.com X-Mailman-Version: 2.1.29 X-BeenThere: ffmpeg-devel@ffmpeg.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: FFmpeg development discussions and patches List-Help: Subject: Re: [FFmpeg-devel] [PATCH] doc: Remove libav-merge.txt Content-Type: multipart/mixed; boundary="===============0801669165461059725==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============0801669165461059725== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 4E09F68DF44 for ; Sat, 28 Jun 2025 21:02:36 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1751133754; x=1751738554; i=eclipse7@gmx.net; bh=c7yKHfpLW5GPb5v9L8vKEbU+izUNqpGzMZx/kLIFb8o=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:Message-ID:References: MIME-Version:Content-Type:In-Reply-To:Content-Transfer-Encoding: cc:content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=joD+4S6WvahKxi4CJoi2i7rv+riYB+7PVOMZ4/iirNkkyj/kHgeVppor6TqnEjST yBEP9ivPKAV8/lLY/RvdZLKtyYvk6xWZ2/tUpDvKtUye9uyhcmGuVsbpOzmAJbdGW GgjTpV6bobITgd66f9M8FovXTPfA5h/exHSfxuoWf1F958lgaooj8X0dp0FE5LLcq vtzlrK8KykAkmaZI835wwjiKMQ/u2+kBzpjUPrQ/957/amr6yQyX3g4xFwLqOSjy3 tq1A1Sz93D7NlsvoUWoys5YeMivIKWE/cnlXOBHrA4v9wH68lf5pHsENjufMsR1ep UFv4NYsUR+CZxVb9WQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from metallschleim.local ([91.62.20.133]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N7R1J-1umWtL22CT-00xlBu; Sat, 28 Jun 2025 20:02:34 +0200 Date: Sat, 28 Jun 2025 20:02:33 +0200 From: Alexander Strasser To: FFmpeg development discussions and patches Cc: derek.buitenhuis@gmail.com Subject: Re: [FFmpeg-devel] [PATCH] doc: Remove libav-merge.txt Message-ID: References: <20250623201518.45827-1-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250623201518.45827-1-derek.buitenhuis@gmail.com> X-Provags-ID: V03:K1:WHK+tKVaBCbZZvbYu127RLiIQlo//Rbfd4jPWMnA2pbBvOhJjd/ YtSjfRmR7yiGlxiIAbFKykKUlkGN6y7HuSw/2tRWcD3yiDh8a/ebW2QBrc1Co5wolvV/6HI F0BfitG2rjllAkt63tL7AALoQGtYwpW4VMCEAlAMrUQXzMQ71ph/vgzNcExGoNs/3VODzkk kDM+d4tVgk2V9DQsa427A== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:rmU7Rq5A3Bc=;f72KbHsOXcRJ8xmrMeCVBiPLkLt FVsRliS1L40x8/lte6P8f2/SnNMT4UauKWAEw7cF3tV//32Aw1a6ZV49xaWAF7RaQLdEeReMR ELU3mVjI1E87QHRlVP7cXPiaWYG5qW/MeAZAVrq2e2GDrm0nZ5mz5PwsaivMgPMdsGiJ3hX1u eGUXap3BYC+iOcFgJrcfJSo0S/fe85Qx45RAd3Lp3UvMSN5viyXbswzqVLsqEKD7Cfu6Myi1c qrt4Ff5nouk7OZknU+Iq89paqXpBs2bGsgdvKFTHQu/TaE90MArjHxHDWocN6GqkNOObfFzvK 8aA2zzAzfyAdeR2+JSbjNIL2CM57fTJWetfAHGZCRpZa6Sq6/WaRMP6aklLpEHv+Htl+9wZGz eH+Ip4W89PhFe/11CQDqItjoeMxXVDg7pJOCUM5MYpB3TSCD/p7mg6prLw0qJVxL7yzUL8+jD PABq+1W0WE6QH/hSWd7CFFDoLSXoeoo8sKJylE5HyJUmkT7GIuY1HFtrndypJPX3fBJCAH4wt NdH857yp9s5hj4iwFP9Z68jjMpgOBkdGmONN+neIeCllyYnSBNWdVEzZvSRViWccYo4yGfD1o vTqgLj8wODKLrSTZli9pGE11xZkt2miJykyuW1fq0eBgBMsGFGOQCK0LhL6HZnGSn7Y7jiGYi VuEfVQekkqUlqP037Y7qR3It60/el2qFga4lkH1AAdgqWmWMgV5gVS70TClkAxpbxRo56e5I3 9uhoCDQXp3VOTFfClvJluZeEGz/TQ96xJMbjl8oOfBDqYIDas6IRIueC1nTerhrydyyMa5yOE ARXHStGbWDKllsaAwMFYyLSLdUldp0IdkgaOgQnD5cthj0sCiOwzH7Xr47XpLVbvosz2CpbCz hos72Cz0zxelWHYar6MbpUWRP+OERxO0gfjYSI4dqLD23Lx63HdZBD9kAx+AWSOkGSWO8uYCs JQSV+CnHrvSw4B1YBiZIRoUVCzfX51dGs8ibBqS1SF1PjccGvTzAfxUcuZNW7vOrEQuFWc3Mw 3ZL0gauLNDQl3bfKZJ78sCC95zD0wliONZxa01fjNAxlL/xKb8hMBAguGxqFXJUu8eAZlx1yf rKAigrs02I56Yv5Ou1wlrzTGrUuoltOTeJDfPicCsn5kY6O7+rxSJMGWhVWUnFoKiuxK0kONf lBRG97Ro5UZvDrqG4iVhBfFBH62GoKrg+XBDGGrLzMqLcuwILXpV2ygKRb6vgQkM4M5cDnMfb vSs6xOftunaOqmox5KU+LtPvRpd+yWacuF2C+jn4yoksI8GiB10biS43fHQomZBt9z64ZAEGF I9AEOdTyi1jyIma691TtU37KG6+moTSUvIztqBIfV/UwhIaa5ehDi/af4v7g7Ev81snvfthyc prumI6AdIHLvrdAYc3jpoVa+wcYQ6jZj8EDDs8JI4BUpr8vz8jYY46n2ZrLXA4vPz4qxcfviN wvz6ijpiBrGtvEzjzmoJC3ALL1GrGwwXSfQ4IPMCCCN1BzPea6NzvF2UzLU0pdszSP7d1sDkQ r/W4Al+7hGwKzDPTCTupps8f4dJ18i29pbppOc1ddtoi3eJr22Iq8lRdN5GfH4JfVO70t2rCq 4r5RmXAhspIGUiIF19bswhcc71f0Hjs06Plj/vP+KdIzr8EwjIVKM7LAEZsvrD0D8HIH1Tbro TjTGhLJHO14U70RtyQR9RQVltBx0DVaL3ISdoATb4uwCF/5ykAZhOvNSWV3c6cdtMPXOEjReS uHqxBLyHRPK2eDm36k69ufQamfL7gec1TZMlibMKf2w/iafRywIfN4Z5+Q5jLDMB1XFu/TKyX 7fInDPxDHT6fbvo3c50d5OOQSG7LIUjF+/I1tL/mMYircpwPs0SpYSPSKpLmpAU05mxM3rIYy oZIv9S0POwFlPoaUhs+mI+K662VVMChORIH3jOMFtJbBpftcWQbkfqFFBpa0AVDmfvSytXFVm o5RBRwMDueTUd17cs0Och9gzEDOHlH4wpYQA28tE8fnnC/e/7EXJ5glAjvhDLNqjl4/fDrxG1 669pXZfr01hiJO0DN7o9kU2WE8t3oNjOxOjC5OwddW84EV+yDtIaMlka26iIL+EyQMbqVZ4qY N53TViXNhaHe5h/bNjqqZKp0XQT8Hm09RzaM2lmGpfO5fbdC7ZYq7i9fHfpNAJzHWGyGaolMF 1/B6W/dr1k31MsNbgEkLdwfny6KKqsNyVBjj1ReI9XWOWtDEiAk2DH0gV/DeBRu1yGRBZV7El G1/5iegedemGBqNnO6Q3MvkvYlvj08VwagTHYijthBQfbBxAvtrc6BMcr8IYYuVIE5p3TyfRh TeFM9NSBZY3lJA3FpQAyahKSd9umif1VzmHBJsmf2u64yXDJPVkYv8q8EgULTIDoI8XUlqGZa 1M/fZZte7MrPJC7zI3ztlJ7HcoFhVu7qG0/VpmG1Bmw4dx0XJvrUmZYNasEwtuGIszBoPvpN8 /MWK8G+nbytTMBqTQglwdGNwGJNjmwtJKtuAn0gDhx8rS4bVrYizfCMtfaE3EIF9if/T6OTAE 3zieT7h5FVjoIWHj2vr+EH3r0d9Z+JbRutWnngxn5VFv8IJNcd0Qwj/UG4N01Wx6llKz8wWXN jdp7j9AZ1Ohe9/TKndr2+N1qH+FkIhqFvHliJKnKwXdVyNMqr65D9ingit9wO4wiIajqiPtsS RKjbPMk18UjD82XALk4YjsVitGlb/Lgi1uq9IJTUtlm8GwlVafmKLoUOqaOGwYr6ETTykQ6QN 1ldhbyvYvtIU0W8Auxb9YBt9KPxoh65FsIt+CJKUG+MNUyVpDmwioS0N4IXhbNS/tPYeh6ZN9 EkRSVMDPyobbbuZHjQyIG1t0STvEuDenvfb8mlARHVVCs1novprNGFhYyhjGMIDwOVp4MvxyQ rcyr6hDBJV9RiXWTjEBgC7UMEjIMIS0hciJu6dVjjhoET/bTwHDL8j/STc53sHMlvs7yGs2kV 0qVDOItHpNlsnDVJdhst3D18ylycM2nl9KV/zAdqkxNmFmqZ9t30KWSMxDz7rDNXVKwMryneP svFBzQf9tKlv2Sik+ehlbCNONEbJRKPC9Gkx63C3zSzOgbUAAF7rfs+mgV5snpXf5NaK+ote+ +HHoGWAybuFJgG3hnl3o/J3me7OW32rscmhS7HjjXvqcJydVtMS5Gw6JW8TWr/8UAZvyiIfDK L6Jaou3wW8iEnAP1PS/apnjo7lUZeBdTlPgFYkwrx9K4TXcUZClffCBitCyjrSi9Y8fO0/G/b vrXTnumt+QsYJn9VtDItsXbV2D0jy6ksAmLuQT3fNOjJ0hVoSKGG/HHCIwhNQjizjNpNCCUbH s0k6pPwoi+alJXSalY78VUoxgCdSOy50+Cv/WAAjs9O4fJ+s/7YFEDJhCofXk3+h+JaPF86pq zfxOeByt7khOan6KXKkBPQWr8jksvQRnPP8W0+eto= Content-Transfer-Encoding: quoted-printable Hi Derek, I didn't see this before commenting on your libav-merge-next-commit removal patch. Should be OK if there is nothing of use in left in the section TODO/FIXME/UNMERGED . On 2025-06-23 21:15 +0100, Derek Buitenhuis wrote: > He's dead, Jim. I would appreciate it if you could change the commit message to something that is a bit more boring (tho yours is kind of funny if one gets the reference). Or maybe just combine this with libav-merge-next-commit removal. Best regards, Alexander > Signed-off-by: Derek Buitenhuis > --- > doc/libav-merge.txt | 115 -------------------------------------------- > 1 file changed, 115 deletions(-) > delete mode 100644 doc/libav-merge.txt >=20 > diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt > deleted file mode 100644 > index bcd0aacba5..0000000000 > --- a/doc/libav-merge.txt > +++ /dev/null > @@ -1,115 +0,0 @@ > -CONTEXT > -=3D=3D=3D=3D=3D=3D=3D > - > -The FFmpeg project merges all the changes from the Libav project > -(https://libav.org) since the origin of the fork (around 2011). > - > -With the exceptions of some commits due to technical/political disagree= ments or > -issues, the changes are merged on a more or less regular schedule (dail= y for > -years thanks to Michael, but more sparse nowadays). > - > -WHY > -=3D=3D=3D > - > -The majority of the active developers believe the project needs to keep= this > -policy for various reasons. > - > -The most important one is that we don't want our users to have to choos= e > -between two distributors of libraries of the exact same name in order t= o have a > -different set of features and bugfixes. By taking the responsibility of > -unifying the two codebases, we allow users to benefit from the changes = from the > -two teams. > - > -Today, FFmpeg has a much larger user database (we are distributed by ev= ery > -major distribution), so we consider this mission a priority. > - > -A different approach to the merge could have been to pick the changes w= e are > -interested in and drop most of the cosmetics and other less important c= hanges. > -Unfortunately, this makes the following picks much harder, especially s= ince the > -Libav project is involved in various deep API changes. As a result, we = decide > -to virtually take everything done there. > - > -Any Libav developer is of course welcome anytime to contribute directly= to the > -FFmpeg tree. Of course, we fully understand and are forced to accept th= at very > -few Libav developers are interested in doing so, but we still want to r= ecognize > -their work. This leads us to create merge commits for every single one = from > -Libav. The original commit appears totally unchanged with full authorsh= ip in > -our history (and the conflict are solved in the merge one). That way, n= ot a > -single thing from Libav will be lost in the future in case some reunifi= cation > -happens, or that project disappears one way or another. > - > -DOWNSIDES > -=3D=3D=3D=3D=3D=3D=3D=3D=3D > - > -Of course, there are many downsides to this approach. > - > -- It causes a non negligible merge commits pollution. We make sure ther= e are > - not several level of merges entangled (we do a 1:1 merge/commit), but= it's > - still a non-linear history. > - > -- Many duplicated work. For instance, we added libavresample in our tre= e to > - keep compatibility with Libav when our libswresample was already cove= ring the > - exact same purpose. The same thing happened for various elements such= as the > - ProRes support (but differences in features, bugs, licenses, ...). Th= ere are > - many work to do to unify them, and any help is very much welcome. > - > -- So much manpower from both FFmpeg and Libav is lost because of this m= ess. We > - know it, and we don't know how to fix it. It takes incredible time to= do > - these merges, so we have even less time to work on things we personal= ly care > - about. The bad vibes also do not help with keeping our developers mot= ivated. > - > -- There is a growing technical risk factor with the merges due to the c= odebase > - differing more and more. > - > -MERGE GUIDELINES > -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > - > -The following gives developer guidelines on how to proceed when merging= Libav commits. > - > -Before starting, you can reduce the risk of errors on merge conflicts b= y using > -a different merge conflict style: > - > - $ git config --global merge.conflictstyle diff3 > - > -tools/libav-merge-next-commit is a script to help merging the next comm= it in > -the queue. It assumes a remote named libav. It has two modes: merge, an= d noop. > -The noop mode creates a merge with no change to the HEAD. You can pass = a hash > -as extra argument to reference a justification (it is common that we al= ready > -have the change done in FFmpeg). > - > -Also see tools/murge, you can copy and paste a 3 way conflict into its = stdin > -and it will display colored diffs. Any arguments to murge (like ones to= suppress > -whitespace differences) are passed into colordiff. > - > -TODO/FIXME/UNMERGED > -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > - > -Stuff that didn't reach the codebase: > -------------------------------------- > - > -- HEVC DSP and x86 MC SIMD improvements from Libav (see https://ffmpeg.= org/pipermail/ffmpeg-devel/2015-December/184777.html) > - - 1f821750f hevcdsp: split the qpel functions by width instead of by = the subpixel fraction > - - 818bfe7f0 hevcdsp: split the epel functions by width > - - 688417399 hevcdsp: split the pred functions by width > - - a853388d2 hevc: change the stride of the MC buffer to be in bytes i= nstead of elements > - - 0cef06df0 checkasm: add HEVC MC tests > - - e7078e842 hevcdsp: add x86 SIMD for MC > - - 7993ec19a hevc: Add hevc_get_pixel_4/8/12/16/24/32/48/64 > -- use av_cpu_max_align() instead of hardcoding alignment requirements (= see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html) > - - f44ec22e0 lavc: use av_cpu_max_align() instead of hardcoding alignm= ent requirements > - - 4de220d2e frame: allow align=3D0 (meaning automatic) for av_frame_g= et_buffer() > -- Support recovery from an already present HLS playlist (see 16cb06bb30= ) > -- Remove all output devices (see 8e7e042d41, 8d3db95f20, 6ce13070bd, d4= 6cd24986 and https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/2169= 04.html) > -- avcodec/libaomenc: export the Sequence Header OBU as extradata (See a= 024c3ce9a) > - > -Collateral damage that needs work locally: > ------------------------------------------- > - > -- Merge proresenc_anatoliy.c and proresenc_kostya.c > -- Fix MIPS AC3 downmix > - > -Extra changes needed to be aligned with Libav: > ----------------------------------------------- > - > -- Switching our examples to the new encode/decode API (see 67d28f4a0f) > -- HEVC IDCT bit depth 12-bit support (Libav added 8 and 10 but doesn't = have 12) > --=20 --===============0801669165461059725== 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". --===============0801669165461059725==--