Commit c6965f62 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '44f7df0c'

* commit '44f7df0c':
  dds: Write the palette in the native endian form

Conflicts:
	libavcodec/dds.c

See: 36a87c2dMerged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 64539e12 44f7df0c
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