hevc: fix last merge