[FFmpeg-cvslog] Merge commit '5a01ab0e62c95a60b4848744e623640f5dafe23b' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 02:11:04 2013 +0200| [f86b2e4f499a36fd8bb084d7bbd8384ed26ba1cd] | committer: Michael Niedermayer

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 at gmx.at>

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