Merge "Added two more video encoders"