From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Sun, 8 May 2016 22:48:55 +0000 (+0100)
Subject: Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'
X-Git-Tag: android-x86-7.1-r1~5298
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6c007036850c573a7db3c82fc5f184374b8b16b1;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'

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

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

6c007036850c573a7db3c82fc5f184374b8b16b1
diff --cc libavcodec/dds.c
index feaaba5a24,0e9d9b94f9..50350f1fbb
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@@@ -356,12 -355,12 +356,16 @@@ static int parse_pixel_format(AVCodecCo
          /* 16 bpp */
          else if (bpp == 16 && r == 0xff && g == 0 && b == 0 && a == 0xff00)
              avctx->pix_fmt = AV_PIX_FMT_YA8;
 +        else if (bpp == 16 && r == 0xff00 && g == 0 && b == 0 && a == 0xff) {
 +            avctx->pix_fmt = AV_PIX_FMT_YA8;
 +            ctx->postproc = DDS_SWAP_ALPHA;
 +        }
          else if (bpp == 16 && r == 0xffff && g == 0 && b == 0 && a == 0)
              avctx->pix_fmt = AV_PIX_FMT_GRAY16LE;
+         else if (bpp == 16 && r == 0x7c00 && g == 0x3e0 && b == 0x1f && a == 0)
+             avctx->pix_fmt = AV_PIX_FMT_RGB555LE;
+         else if (bpp == 16 && r == 0x7c00 && g == 0x3e0 && b == 0x1f && a == 0x8000)
+             avctx->pix_fmt = AV_PIX_FMT_RGB555LE; // alpha ignored
          else if (bpp == 16 && r == 0xf800 && g == 0x7e0 && b == 0x1f && a == 0)
              avctx->pix_fmt = AV_PIX_FMT_RGB565LE;
          /* 24 bpp */