Additional changes to attempt to fix ffmpeg not building