Cosmetic fix of variable numValidMergeCand to correct reflect the number of affine merge candidate in the decoder side