(HEVC) Align CommonConstant with Damien's branch.
(AVC) Fixes #1