Browse code

Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'

* commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc':
dds: Add support for rgb555 files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Derek Buitenhuis authored on 2016/05/09 07:48:55
Showing 1 changed files
... ...
@@ -362,6 +362,10 @@ static int parse_pixel_format(AVCodecContext *avctx)
362 362
         }
363 363
         else if (bpp == 16 && r == 0xffff && g == 0 && b == 0 && a == 0)
364 364
             avctx->pix_fmt = AV_PIX_FMT_GRAY16LE;
365
+        else if (bpp == 16 && r == 0x7c00 && g == 0x3e0 && b == 0x1f && a == 0)
366
+            avctx->pix_fmt = AV_PIX_FMT_RGB555LE;
367
+        else if (bpp == 16 && r == 0x7c00 && g == 0x3e0 && b == 0x1f && a == 0x8000)
368
+            avctx->pix_fmt = AV_PIX_FMT_RGB555LE; // alpha ignored
365 369
         else if (bpp == 16 && r == 0xf800 && g == 0x7e0 && b == 0x1f && a == 0)
366 370
             avctx->pix_fmt = AV_PIX_FMT_RGB565LE;
367 371
         /* 24 bpp */