[ffmpeg/f39: 20/20] Merge branch 'f40' into f39