Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Dec 2012 12:25:53 +0000 (13:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Dec 2012 12:25:53 +0000 (13:25 +0100)
* 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>
1  2 
libavcodec/flac_parser.c
libavcodec/flacdec.c

Simple merge
Simple merge