Merge commit 'd08d8b61aa'

Browse source

* commit 'd08d8b61aa':
  dds: Fix 32bpp bitmaps decoding

Conflicts:
	libavcodec/dds.c

See: 5c583b1419
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

...

This commit is contained in:

Michael Niedermayer 2015-07-22 17:29:34 +02:00

parent 05cf687d13 d08d8b61aa

commit b68e445f9b

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