Changeset a996eacc in ffmpeg

Timestamp:

May 22, 2014, 1:27:21 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

37cef8c7

Parents:

124c94a1 (diff), eff913c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (05/22/14 13:27:18)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/22/14 13:27:21)

Message:

Merge remote-tracking branch 'cehoyos/master'

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

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

(No files)