diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:49:20 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:49:26 +0100 |
| commit | 6ebec1049ea66b252dc89ade2bf78560629aea1f (patch) | |
| tree | a3a38a4a4e284b124ac8ee2ecefd61438626ae28 /libavcodec/dds.c | |
| parent | 6c007036850c573a7db3c82fc5f184374b8b16b1 (diff) | |
| parent | 02538636261fdec9c70f4185b23147c636f269b4 (diff) | |
| download | ffmpeg-6ebec1049ea66b252dc89ade2bf78560629aea1f.tar.gz | |
Merge commit '02538636261fdec9c70f4185b23147c636f269b4'
* commit '02538636261fdec9c70f4185b23147c636f269b4':
dds: Add support for alpha-only files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/dds.c')
| -rw-r--r-- | libavcodec/dds.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dds.c b/libavcodec/dds.c index 50350f1fbb..bd9b93bdee 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; |