Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Apr 2014 21:57:37 +0000 (23:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Apr 2014 21:57:42 +0000 (23:57 +0200)
commit01a5d717891465bd126d2d3c318a022acd812bf5
treefad37db1400a5e14ab3a89ef1e3ebcb81d4bcf38
parent9e7f1474dd5f3d33794b46e9a6555031c5165023
parent3d5c859fa6dcca9c6b37f90a5dac148c01ab4758
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Set Matroska private data when muxing Prores.

Merged-by: Michael Niedermayer <michaelni@gmx.at>