Merge "C2SoftAvcEnc: add support to use ih264e instead of ive structures"