[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 22 15:27:18 2014 +0200| [a996eacce269218178c9d8a5fdd507ae22c4b646] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Autodetect Asterisk raw pcm with extension "sln".

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

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