x86/hevc_add_res: merge last remaining changes from 3d6535983282bea542dac2e568ae50da5...