Merge commit 'cfdaa4de6c496b0b761c763cd18067cb1af268a7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 21:22:57 +0000 (23:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 21:24:16 +0000 (23:24 +0200)
commitcea62a90c0b76d872f5dea554a4ef8f08a1654b6
tree8b15ff051be6a19df9615d88a8241c492019bf82
parentc949a4500e146e2bd4b341abd3b2e943e163088a
parentcfdaa4de6c496b0b761c763cd18067cb1af268a7
Merge commit 'cfdaa4de6c496b0b761c763cd18067cb1af268a7'

* commit 'cfdaa4de6c496b0b761c763cd18067cb1af268a7':
  dss_sp: use lowercase codec name without whitespace

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