Merge "CCodec: handle vendor parameters"