Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 17:31:24 +0000 (19:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 17:43:38 +0000 (19:43 +0200)
commitb8044972c4f23e2d2fdf2c5a8ba67019a5045149
treeefef28d683123a9609eb2aba36be6ad4c197da0b
parent0da50055ebafb7852e80825abd0b8e5e72bd8b60
parent117d8c6d1f1c187ffc6098d9618457e00534e013
Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'

* commit '117d8c6d1f1c187ffc6098d9618457e00534e013':
  matroska: implement support for ProRes
  matroska: implement support for ALAC

Conflicts:
libavformat/matroskaenc.c

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