Merge "Encoder: Return error for odd resolution" into mnc-dev