ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'

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

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch 2016-06-21 12:20:38 +02:00
commit f36fcf7b6c
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dds.c
View File

@ -242,6 +242,10 @@ static int parse_pixel_format(AVCodecContext *avctx)
ctx->paletted = 1; ctx->paletted = 1;
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
break; break;
case MKTAG('G', '1', ' ', ' '):
ctx->compressed = 0;
avctx->pix_fmt = AV_PIX_FMT_MONOBLACK;
break;
case MKTAG('D', 'X', '1', '0'): case MKTAG('D', 'X', '1', '0'):
/* DirectX 10 extra header */ /* DirectX 10 extra header */
dxgi = bytestream2_get_le32(gbc); dxgi = bytestream2_get_le32(gbc);

1
tests/fate/image.mak
View File

@ -65,6 +65,7 @@ DDS_FMT = alpha8 \
dxt5-xrbg \ dxt5-xrbg \
dxt5-ycocg \ dxt5-ycocg \
dxt5-ycocg-scaled \ dxt5-ycocg-scaled \
monob \
pal \ pal \
pal-ati \ pal-ati \
rgb1555 \ rgb1555 \

6
tests/ref/fate/dds-monob Normal file
View File

@ -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