Merge commit '91a6944e56236234f0a7ba162404665753cbcb51'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 07:28:03 +0000 (09:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 07:28:23 +0000 (09:28 +0200)
commit6635b13411a8a9399e57c73b79a16c60d6505a03
treed7a3a711af06e711c405b3ddb8954b3c7d046566
parent63e5e9f7c5ad10d522bd6fd247c54c037d3b3aa9
parent91a6944e56236234f0a7ba162404665753cbcb51
Merge commit '91a6944e56236234f0a7ba162404665753cbcb51'

* commit '91a6944e56236234f0a7ba162404665753cbcb51':
  vmd: use the PALETTE_COUNT constant uniformly

Conflicts:
libavcodec/vmdav.c

No change as the changed line does not exist in ffmpegs vmdav.c

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