mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-08-09 17:39:08 +00:00
d5d62e04b9
Trim out any files we don't need downstream. Automate doing the subtree merges, and automate resolving the conflicts for updates for files that we want to have removed. If updates end up with other conflicts, the script (or in practice, git) exits without creating the intended merge commit - but regular updates should run automatically.