Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 19:17:41 +0000 (21:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 19:18:11 +0000 (21:18 +0200)
commit92de4450347cbee96e64de341ac6fa733ea13cd1
treef50e9b877f491582ebe908dc91fc1c2e013133e8
parent8cad746093dbabc0a46ce6dc05e2443261930162
parentfa38573cd9ce4ab727f86f57c03b113cfd4c9d0a
Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a'

* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a':
  matroska: Register mime types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskadec.c