xwddec: support 8bpp grayscale

(cherry picked from commit b9c94e82) Signed-off-by: Diego Biurrun <diego@biurrun.de>

xwddec: support 8bpp grayscale
(cherry picked from commit b9c94e82) Signed-off-by: Diego Biurrun <diego@biurrun.de>
a05c6e8c · Piotr Bandurski · Diego Biurrun · d34a133b · a05c6e8c
Commit a05c6e8c authored Jun 24, 2012 by Piotr Bandurski Committed by Diego Biurrun Aug 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

xwddec.c libavcodec/xwddec.c +3 -1

No files found.
--- 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: