xwddec: support 8bpp grayscale

b9c94e82 · Piotr Bandurski · Paul B Mahol · 244682dd · b9c94e82
Commit b9c94e82 authored Jun 24, 2012 by Piotr Bandurski Committed by Paul B Mahol Jun 24, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

xwddec.c libavcodec/xwddec.c +5 -2

No files found.
--- a/libavcodec/xwddec.c
+++ b/libavcodec/xwddec.c
@@ -157,10 +157,13 @@ 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)
            return AVERROR_INVALIDDATA;
-        if (pixdepth == 1)
+        if (pixdepth == 1) {
            avctx->pix_fmt = PIX_FMT_MONOWHITE;
+        } else if (pixdepth == 8) {
+            avctx->pix_fmt = PIX_FMT_GRAY8;
+        }
        break;
    case XWD_STATIC_COLOR:
    case XWD_PSEUDO_COLOR: