Merge commit '5a01ab0e62c95a60b4848744e623640f5dafe23b' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 00:11:04 +0000 (02:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 00:11:04 +0000 (02:11 +0200)
commitf86b2e4f499a36fd8bb084d7bbd8384ed26ba1cd
treeee8f3cd97baa9ea7aabdc23a2db73cccda0ff483
parentd6373f15869720ac6de93eba61b0a4a7a450d4c9
parent5a01ab0e62c95a60b4848744e623640f5dafe23b
Merge commit '5a01ab0e62c95a60b4848744e623640f5dafe23b' into release/1.1

* commit '5a01ab0e62c95a60b4848744e623640f5dafe23b':
  vmd: use the PALETTE_COUNT constant uniformly

Conflicts:
libavcodec/vmdav.c

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