Software changes with respect to the adoption from proposal JVET-O0455:
Control the maximum number of IBC merge candidates independently from
the maximum number of regular merge candidates.