Another try at fixing swscale on win64, as per r31153.