History

Merge commit '02538636261fdec9c70f4185b23147c636f269b4'

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

Derek Buitenhuis committed 10 years ago

Commit 6ebec102 parents 6c00703 02538631 file · +2 −0Browse files

Unified · Split

libavcodec/dds.c+2−0
@@ -353,6 +353,8 @@ static int parse_pixel_format(AVCodecContext *avctx) · 352 unmodified lines
353 /* 8 bpp */353 /* 8 bpp */
354 if (bpp == 8 && r == 0xff && g == 0 && b == 0 && a == 0)354 if (bpp == 8 && r == 0xff && g == 0 && b == 0 && a == 0)
355 avctx->pix_fmt = AV_PIX_FMT_GRAY8;355 avctx->pix_fmt = AV_PIX_FMT_GRAY8;
356 else if (bpp == 8 && r == 0 && g == 0 && b == 0 && a == 0xff)
357 avctx->pix_fmt = AV_PIX_FMT_GRAY8;
356 /* 16 bpp */358 /* 16 bpp */
357 else if (bpp == 16 && r == 0xff && g == 0 && b == 0 && a == 0xff00)359 else if (bpp == 16 && r == 0xff && g == 0 && b == 0 && a == 0xff00)
358 avctx->pix_fmt = AV_PIX_FMT_YA8;360 avctx->pix_fmt = AV_PIX_FMT_YA8;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t