diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:25:27 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:25:27 +0400 |
| commit | fa164406597e54d52102cfa5d3cb84c7a858c4b2 (patch) | |
| tree | 15fcd657211f71bf08099ee69fd76ad001a3360d /libavformat/ast.c | |
| parent | c36fd16aaa0bf67b2af254ef8324dc8d8ee9fca7 (diff) | |
| parent | 79041d92ee7421853ee8c57fc13891cb0c272e0e (diff) | |
Merge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2
* commit '79041d92ee7421853ee8c57fc13891cb0c272e0e':
matroska: add the Opus mapping
Conflicts:
libavformat/matroska.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ast.c')
0 files changed, 0 insertions, 0 deletions