[ffmpeg/f31] (6 commits) ...Update to 4.2.1 release