[ffmpeg/f39] (2 commits) ...Merge branch 'f40' into f39