Merge commit '4d55484391112a30d16812597b9ad81605af0c24'
* commit '4d55484391112a30d16812597b9ad81605af0c24': dds: Fix palette mode on big endian Conflicts: libavcodec/dds.c See: 21d2e3d602dc5f173901ba51f6a237b9dfce9e8e Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
87544ce8dc