[FFmpeg-cvslog] Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  9 02:23:32 2014 +0200| [349a32c436d9511fe786c761cc2728f5b5efea0e] | committer: Michael Niedermayer

Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=349a32c436d9511fe786c761cc2728f5b5efea0e
---