Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:09:42 +0000 (12:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:20:12 +0000 (12:20 +0200)
commitef13967e601bb0851af04182ea2aeeea8a3025bd
treee14f85be5ae38de983822f7461c753035cdf8778
parent8518da23f59d8f5a52f7c1c919f584a119484d0f
parentf13ffb6636fdecb5e3e0ddcff48f096e7b3db362
Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362'

* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362':
  flacdec: do not overwrite a channel layout set by the caller

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flac.c