[FFmpeg-cvslog] Merge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  5 22:57:12 2015 +0200| [1ace789fb344fcc571503f2246f542eeb62bd865] | committer: Michael Niedermayer

Merge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818'

* commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818':
  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=1ace789fb344fcc571503f2246f542eeb62bd865
---