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: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment