Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'

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

Merged-by: Clément Bœsch <clement@stupeflix.com>

diff --cc libavcodec/dds.c
Simple merge

diff --cc tests/fate/image.mak
Simple merge

diff --cc tests/ref/fate/dds-monob
index 0000000000000000000000000000000000000000,370a4317e45f4561f352778c18c5bec9940e8639..629b417035aed5739c1c7098cf5e23abdb0aae69
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/fate/dds-monob
+++ b/tests/ref/fate/dds-monob
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 1/25
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 122x122
++#sar 0: 0/1
+ 0,          0,          0,        1,     1952, 0x716498a1