Merge commit '5a01ab0e62' into release/1.1

Browse source

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

Conflicts:
	libavcodec/vmdav.c

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

...

This commit is contained in:

Michael Niedermayer 2013-06-03 02:11:04 +02:00

parent d6373f1586 5a01ab0e62

commit f86b2e4f49

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available