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)
* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
  matroska: list supported extensions

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

Simple merge