Commit 6635b134 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '91a6944e'

* commit '91a6944e':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 63e5e9f7 91a6944e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment