Merge commit '02538636261fdec9c70f4185b23147c636f269b4'

* commit '02538636261fdec9c70f4185b23147c636f269b4': dds: Add support for alpha-only files Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago · 6ebec1049e
parent 6c00703685 0253863626
commit 6ebec1049e
1 changed files with 2 additions and 0 deletions
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@ -353,6 +353,8 @@ static int parse_pixel_format(AVCodecContext *avctx)
        /*  8 bpp */
        if (bpp == 8 && r == 0xff && g == 0 && b == 0 && a == 0)
            avctx->pix_fmt = AV_PIX_FMT_GRAY8;
+        else if (bpp == 8 && r == 0 && g == 0 && b == 0 && a == 0xff)
+            avctx->pix_fmt = AV_PIX_FMT_GRAY8;
        /* 16 bpp */
        else if (bpp == 16 && r == 0xff && g == 0 && b == 0 && a == 0xff00)
            avctx->pix_fmt = AV_PIX_FMT_YA8;