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)
commit98256622a66ebda8f07bb725419c35bb8aa7e01b
tree76f39fe2fbf9c91a5fbb8a55251e36ebf55121a8
parent3f72dbe4620716113754d06b7ffd558e56d1585f
parentaef5150719f03ce87e67c17d2006e24d8961aa17
Merge remote-tracking branch 'qatar/master'

* 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>
libavcodec/flac_parser.c
libavcodec/flacdec.c