RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xwddec: support 8bpp grayscale 

(cherry picked from commit b9c94e826e)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Piotr Bandurski 2012-06-24 11:34:02 +00:00 committed by Diego Biurrun
parent d34a133b78
commit a05c6e8c11
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/xwddec.c
View File

@ -155,10 +155,12 @@ static int xwd_decode_frame(AVCodecContext *avctx, void *data,
switch (vclass) {
case XWD_STATIC_GRAY:
case XWD_GRAY_SCALE:
if (bpp != 1)
if (bpp != 1 && bpp != 8 || bpp != pixdepth)
return AVERROR_INVALIDDATA;
if (pixdepth == 1)
avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
else if (pixdepth == 8)
avctx->pix_fmt = AV_PIX_FMT_GRAY8;
break;
case XWD_STATIC_COLOR:
case XWD_PSEUDO_COLOR: