Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 00:54:48 +0000 (02:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 01:06:20 +0000 (03:06 +0200)
commitf6777ce6fe7cefb027789c069ec14b394a874073
tree369b6378cc2ecd2c30644082205e5e8be0862bca
parent5b134a0544ebfd129b087c3a2bb68a8847232322
parent1a02e78653a5c7674e6c43b6e6f2748dbd2091d7
Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'

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

See: ddabecbbf5509325c6c695ccc60d67c0af2065f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1.c
libavcodec/vc1.h
libavcodec/vc1dec.c