[svt-hevc/f35] (2 commits) ...Fix build