Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 20:12:03 +0000 (22:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 20:12:36 +0000 (22:12 +0200)
commit56cc754c76d3aba81e121502d0d420242b7023b1
treee0792f54be291f5dabd4cdb6e8f1576a00974ddd
parentc6a3b009249892e7cfac59ca3c2b489e2c88b22b
parentf2583bc86eb5d7decc639fc9a36edc93e6003eef
Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'

* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
  matroska: list supported extensions

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