Merge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:57:12 +0000 (22:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:57:46 +0000 (22:57 +0200)
commit1ace789fb344fcc571503f2246f542eeb62bd865
tree35754426c5bc8a5858c60719f416178723e6ac9e
parentff849e11e361a8e5161cf4f2896acfeeec1caeef
parent60f1cc4a1ffcbf24acbb543988ceeaec76b70818
Merge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818'

* commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818':
  alsdec: only adapt order for positive max_order

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