[FFmpeg-cvslog] Merge commit '7d039e70a5ff23a7deaa866684d2e8872acc5169'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 04:37:53 2013 +0200| [4d2825a31719772f54feb33a92b725e285e564c6] | committer: Michael Niedermayer

Merge commit '7d039e70a5ff23a7deaa866684d2e8872acc5169'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d2825a31719772f54feb33a92b725e285e564c6
---