Merge commit '4d55484391112a30d16812597b9ad81605af0c24'

* commit '4d55484391112a30d16812597b9ad81605af0c24':
  dds: Fix palette mode on big endian

Conflicts:
	libavcodec/dds.c

See: 21d2e3d602
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-24 20:53:26 +02:00
commit 87544ce8dc

Diff Content Not Available