diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 12:20:38 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 12:29:46 +0200 |
| commit | f36fcf7b6cc40cfcad0642cc1c6ed0ceb39b2143 (patch) | |
| tree | 6ba6f608322209fda0d1223a0908bac15924dfcf /libavcodec/dds.c | |
| parent | c8b0d2eb8cba1b845886931fea346a2e8e82daa7 (diff) | |
| parent | 4b2e69397b84d1c1a29ffae6e9f106f2c32b1869 (diff) | |
Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'
* commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869':
dds: Add support for monochrome images
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/dds.c')
| -rw-r--r-- | libavcodec/dds.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/dds.c b/libavcodec/dds.c index 5468a453af..763371a3aa 100644 --- a/libavcodec/dds.c +++ b/libavcodec/dds.c @@ -242,6 +242,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); |