contribs: really fix ffmpeg compilation on Darwin (by reverting most of [25028] and adapting its 2nd hunk to fit the upstream code)