[FFmpeg-cvslog] Merge commit 'cfdaa4de6c496b0b761c763cd18067cb1af268a7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 24 23:22:57 2015 +0200| [cea62a90c0b76d872f5dea554a4ef8f08a1654b6] | committer: Michael Niedermayer

Merge commit 'cfdaa4de6c496b0b761c763cd18067cb1af268a7'

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

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

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