* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362': flacdec: do not overwrite a channel layout set by the caller Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362': flacdec: do not overwrite a channel layout set by the caller Merged-by: Michael Niedermayer <michaelni@gmx.at>