[FFmpeg-cvslog] Merge commit '02538636261fdec9c70f4185b23147c636f269b4'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun May  8 23:49:20 2016 +0100| [6ebec1049ea66b252dc89ade2bf78560629aea1f] | committer: Derek Buitenhuis

Merge commit '02538636261fdec9c70f4185b23147c636f269b4'

* commit '02538636261fdec9c70f4185b23147c636f269b4':
  dds: Add support for alpha-only files

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ebec1049ea66b252dc89ade2bf78560629aea1f
---

 libavcodec/dds.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/dds.c b/libavcodec/dds.c
index 50350f1..bd9b93b 100644
--- 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;


======================================================================