[FFmpeg-cvslog] Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Jul 22 17:29:34 2015 +0200| [b68e445f9b34eb33a54359340eec66b800269587] | committer: Michael Niedermayer

Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'

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

Conflicts:
	libavcodec/dds.c

See: 5c583b141980102530c75d2756b06766742532a1
Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b68e445f9b34eb33a54359340eec66b800269587
---