[FFmpeg-cvslog] Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  9 02:54:48 2014 +0200| [f6777ce6fe7cefb027789c069ec14b394a874073] | committer: Michael Niedermayer

Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'

* commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7':
  vc1: initialize color properties

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

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