* qatar/master:
  flac: only set channel layout if not previously set or on channel count change
  prepare 9_beta3 release

Conflicts:
	RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>