add merge_dix
Merge branch 'hevc_rext' of https://github.com/OpenHEVC/openHEVC.git into hevc_rext