Merge commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5'

[ffmpeg] / libavcodec / xwddec.c

diff --git a/libavcodec/xwddec.c b/libavcodec/xwddec.c
index 64cd8418a2083ef2b54db1b476e049efeebc0413..8b0845fc01376292129e47542d9813e963d3fca9 100644 (file)
--- a/libavcodec/xwddec.c
+++ b/libavcodec/xwddec.c
@@ -157,9 +157,9 @@ static int xwd_decode_frame(AVCodecContext *avctx, void *data,
     case XWD_GRAY_SCALE:
         if (bpp != 1 && bpp != 8)
             return AVERROR_INVALIDDATA;
-        if (pixdepth == 1) {
+        if (bpp == 1 && pixdepth == 1) {
             avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
-        } else if (pixdepth == 8) {
+        } else if (bpp == 8 && pixdepth == 8) {
             avctx->pix_fmt = AV_PIX_FMT_GRAY8;
         }
         break;