From a05c6e8c11b1a17b7c4529294751b917cf0d8e04 Mon Sep 17 00:00:00 2001 From: Piotr Bandurski Date: Sun, 24 Jun 2012 11:34:02 +0000 Subject: [PATCH] xwddec: support 8bpp grayscale (cherry picked from commit b9c94e826e7551027754ecfa60e3e487e0c28fcb) Signed-off-by: Diego Biurrun --- libavcodec/xwddec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/xwddec.c b/libavcodec/xwddec.c index 387b697491..c43724e538 100644 --- a/libavcodec/xwddec.c +++ b/libavcodec/xwddec.c @@ -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: