[FFmpeg-cvslog] Merge commit '378ee3bad5b99e8f90864af9bc851590e0f64825' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Wed May  6 03:34:45 2015 +0200| [146648771c953cf50d98617eaa250ebdf423ffaf] | committer: Michael Niedermayer

Merge commit '378ee3bad5b99e8f90864af9bc851590e0f64825' into release/2.4

* commit '378ee3bad5b99e8f90864af9bc851590e0f64825':
  alsdec: only adapt order for positive max_order

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

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