Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 May 2014 13:27:18 +0000 (15:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 May 2014 13:27:21 +0000 (15:27 +0200)
commita996eacce269218178c9d8a5fdd507ae22c4b646
tree159602f3a3de5bc7c3dc21e5d5e98f62be049a54
parent124c94a1c8dec7f2ba8c7a4a253bdb01cc494917
parenteff913c9725b6578eb4b1fd2bf869bf01e4cf388
Merge remote-tracking branch 'cehoyos/master'

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

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