[FFmpeg-cvslog] Merge commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  5 22:45:30 2015 +0200| [9810aa340842621d72bb46ec880260a7bf1da1b9] | committer: Michael Niedermayer

Merge commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe'

* commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe':
  aacpsy: correct calculation of minath in psy_3gpp_init

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

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