[xpra-codecs-freeworld/f25: 3/3] Patched for building against ffmpeg-3.1 (f25)