Merge commit '7d039e70a5ff23a7deaa866684d2e8872acc5169'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 02:37:53 +0000 (04:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 02:37:58 +0000 (04:37 +0200)
commit4d2825a31719772f54feb33a92b725e285e564c6
treeacbdd63d8987b1fa5b99968988ec55139a89dd07
parent8543575cc4e270b2d53d00ed0d26140a9badc6bd
parent7d039e70a5ff23a7deaa866684d2e8872acc5169
Merge commit '7d039e70a5ff23a7deaa866684d2e8872acc5169'

* commit '7d039e70a5ff23a7deaa866684d2e8872acc5169':
  wavpack: extract channel information from the bitstream

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