[ffmpeg/f25] (7 commits) ...Fixup