Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 00:23:32 +0000 (02:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 00:27:53 +0000 (02:27 +0200)
commit349a32c436d9511fe786c761cc2728f5b5efea0e
tree750f65e4d0edd99f3adc3ac268ec1e2042767f48
parent6414c3ecd0650d3ace687364edf99ef5d6c3f99f
parent0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6
Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'

* commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6':
  mov: support the Color Parameter Atoms 'colr'

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