Update ffmpeg for a few cherry-picked fixes