diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-04-22 17:28:04 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-04-26 16:30:18 -0400 |
| commit | 4b2e69397b84d1c1a29ffae6e9f106f2c32b1869 (patch) | |
| tree | e1d5747fa8e7a2879a142ed941c2333013188b1d | |
| parent | 6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3 (diff) | |
| download | ffmpeg-4b2e69397b84d1c1a29ffae6e9f106f2c32b1869.tar.gz | |
dds: Add support for monochrome images
| -rw-r--r-- | libavcodec/dds.c | 4 | ||||
| -rw-r--r-- | tests/fate/image.mak | 1 | ||||
| -rw-r--r-- | tests/ref/fate/dds-monob | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/dds.c b/libavcodec/dds.c index f549cadf57..91e0c24226 100644 --- a/libavcodec/dds.c +++ b/libavcodec/dds.c @@ -240,6 +240,10 @@ static int parse_pixel_format(AVCodecContext *avctx) ctx->paletted = 1; avctx->pix_fmt = AV_PIX_FMT_PAL8; break; + case MKTAG('G', '1', ' ', ' '): + ctx->compressed = 0; + avctx->pix_fmt = AV_PIX_FMT_MONOBLACK; + break; case MKTAG('D', 'X', '1', '0'): /* DirectX 10 extra header */ dxgi = bytestream2_get_le32(gbc); diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 22e0a33118..e58291ba1d 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -65,6 +65,7 @@ DDS_FMT = alpha8 \ dxt5-xrbg \ dxt5-ycocg \ dxt5-ycocg-scaled \ + monob \ pal \ pal-ati \ rgb1555 \ diff --git a/tests/ref/fate/dds-monob b/tests/ref/fate/dds-monob new file mode 100644 index 0000000000..370a4317e4 --- /dev/null +++ b/tests/ref/fate/dds-monob @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 1952, 0x716498a1 |