Hi Reinhard On Wed, Oct 14, 2026 at 11:37:35AM +0200, Reinhard Nißl via ffmpeg-devel wrote: > Hi Michael, > > Am 14.10.2026 um 06:36 schrieb Michael Niedermayer via ffmpeg-devel: > > Hi Reinhard > > > > On Wed, Oct 14, 2026 at 12:41:04AM +0200, Reinhard Nißl via ffmpeg-devel > > wrote: > > > Am 13.10.2026 um 15:36 schrieb Michael Niedermayer via ffmpeg-devel: > > > > Hi everyone > > > > > > > > On Fri, Sep 25, 2026 at 02:55:42AM +0200, Michael Niedermayer via > > > > ffmpeg-devel wrote: > > > > > Hi everyone > > > > > > > > > > I would like to branch release/9.1 off in 3 weeks and then make the > > > > > 9.1 > > > > > release 2 weeks after that and a 9.1.1 a few weeks after that > > > > > > > > reminder, i will branch release/9.1 off in ~3 days probably > > > PR 22340 needs attention. I've recently provided fixes for fairy's reports > > > > 22340, conflicts with master HEAD, in tests/fate/filter-video.mak > 22340 is Zhao Zhili's pull request, so the fixes are not on that branch. > They are rebased onto current master here: > > https://code.ffmpeg.org/FFmpeg/FFmpeg/compare/master...rnissl:pr/scale-cuda-round
PR 22340 currently conflicts with master in tests/fate/filter-video.mak, so that needs to be resolved before it can be merged. Since it's Zhao Zhili's PR, I understand that your fixes are not on that branch. Thanks for rebasing PR22340 and your changes onto current master, but the compare link is not a PR. PRs go through CI, Fairy and human review before they can be merged. Without a PR, your changes don't go through that process, so I cannot just merge them directly. If getting these changes into 9.1 is important to you, please open a PR. Once it passes CI and Fairy and the review issues are addressed, I can take a look at merging it, if that works out before the release/9.1 branch point i dont know, but theres no reason not to try thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The difference between a dictatorship and a democracy is that every 4 years the population together is allowed to provide 1 bit of input to the government.
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
