generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xwddec: support 8bpp grayscale

Browse Source
This commit is contained in:
Piotr Bandurski 2012-06-24 11:34:02 +00:00 committed by Paul B Mahol
parent 244682dd08
commit b9c94e826e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/xwddec.c
View File

@ -157,10 +157,13 @@ static int xwd_decode_frame(AVCodecContext *avctx, void *data,
switch (vclass) { switch (vclass) {
case XWD_STATIC_GRAY: case XWD_STATIC_GRAY:
case XWD_GRAY_SCALE: case XWD_GRAY_SCALE:
if (bpp != 1) if (bpp != 1 && bpp != 8)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (pixdepth == 1) if (pixdepth == 1) {
avctx->pix_fmt = PIX_FMT_MONOWHITE; avctx->pix_fmt = PIX_FMT_MONOWHITE;
} else if (pixdepth == 8) {
avctx->pix_fmt = PIX_FMT_GRAY8;
}
break; break;
case XWD_STATIC_COLOR: case XWD_STATIC_COLOR:
case XWD_PSEUDO_COLOR: case XWD_PSEUDO_COLOR: