Merge remote-tracking branch 'origin/prefer-ffmpeg'