Merge commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:45:30 +0000 (22:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:45:51 +0000 (22:45 +0200)
* commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe':
  aacpsy: correct calculation of minath in psy_3gpp_init

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

Trivial merge