Merge commit '44f7df0c987965763c609f6dc36974b04182e58d'

Browse Source

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

Conflicts:
	libavcodec/dds.c

See: 36a87c2dc7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

...

This commit is contained in:

Michael Niedermayer

2015-07-23 21:30:28 +02:00

parent 64539e1213 44f7df0c98

commit c6965f62a2

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 Not Available