Update for FFmpeg 4.2.2