Apply haylocki's ffmpeg fixes.