TEST
Revert colmatrix undef the default
Add "--show-param2" option and more precision to the CRF logging.

This is based on komisar's cosmetic patch.
Some people don't like it to show most of settings while encoding.
Merge branch 'plain' into lsmash+mod

Conflicts:
	version.sh
	x264.c