Merge "CCodec: Updates to RevertOutputFormatIfNeeded"