Adapt the patch to more recent FFmpeg habits