Merge "C2SoftAvcEnc: Add support for color aspects"