diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-22 15:27:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-22 15:27:21 +0200 |
| commit | a996eacce269218178c9d8a5fdd507ae22c4b646 (patch) | |
| tree | 159602f3a3de5bc7c3dc21e5d5e98f62be049a54 /libavformat/matroskaenc.c | |
| parent | 124c94a1c8dec7f2ba8c7a4a253bdb01cc494917 (diff) | |
| parent | eff913c9725b6578eb4b1fd2bf869bf01e4cf388 (diff) | |
| download | ffmpeg-a996eacce269218178c9d8a5fdd507ae22c4b646.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Autodetect Asterisk raw pcm with extension "sln".
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
0 files changed, 0 insertions, 0 deletions