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 | |
| parent | c8b0d2eb8cba1b845886931fea346a2e8e82daa7 (diff) | |
| parent | 4b2e69397b84d1c1a29ffae6e9f106f2c32b1869 (diff) | |
| download | ffmpeg-f36fcf7b6cc40cfcad0642cc1c6ed0ceb39b2143.tar.gz | |
Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'
* commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869':
dds: Add support for monochrome images
Merged-by: Clément Bœsch <clement@stupeflix.com>
| -rw-r--r-- | libavcodec/dds.c | 4 | ||||
| -rw-r--r-- | tests/fate/image.mak | 1 | ||||
| -rw-r--r-- | tests/ref/fate/dds-monob | 6 |
3 files changed, 11 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); diff --git a/tests/fate/image.mak b/tests/fate/image.mak index baf87a0f98..a67c07f1e9 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..629b417035 --- /dev/null +++ b/tests/ref/fate/dds-monob @@ -0,0 +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 |