14fa97f2f6
Incorporate more patches from upstream to address compatibility with ffmpeg7 and 8. Directly export them from upstream mercurial to ease tracking