[FFmpeg-cvslog] Merge commit '91a6944e56236234f0a7ba162404665753cbcb51'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 30 09:28:03 2013 +0200| [6635b13411a8a9399e57c73b79a16c60d6505a03] | committer: Michael Niedermayer

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

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