Merge commit '5312818524484a995433b986a2a7a6602572d4db'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Jan 2014 13:52:57 +0000 (14:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Jan 2014 13:53:06 +0000 (14:53 +0100)
* commit '5312818524484a995433b986a2a7a6602572d4db':
  atrac3plus: Make initialization dependant on channel count rather than channel map

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

Simple merge