Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 10:20:38 +0000 (12:20 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 10:29:46 +0000 (12:29 +0200)
commitf36fcf7b6cc40cfcad0642cc1c6ed0ceb39b2143
tree6ba6f608322209fda0d1223a0908bac15924dfcf
parentc8b0d2eb8cba1b845886931fea346a2e8e82daa7
parent4b2e69397b84d1c1a29ffae6e9f106f2c32b1869
Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'

* commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869':
  dds: Add support for monochrome images

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/dds.c
tests/fate/image.mak
tests/ref/fate/dds-monob