RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/dds: Fix GRAY8A decoding. 

Fixes ticket #4667.
This commit is contained in:
Carl Eugen Hoyos 2016-04-15 21:06:34 +02:00
parent f07923253a
commit 139cbeb75e
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dds.c
View File

@ -356,6 +356,10 @@ static int parse_pixel_format(AVCodecContext *avctx)
/* 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 == 0xf800 && g == 0x7e0 && b == 0x1f && a == 0)
@ -387,8 +391,6 @@ static int parse_pixel_format(AVCodecContext *avctx)
ctx->postproc = DDS_NORMAL_MAP;
else if (ycocg_classic && !ctx->compressed)
ctx->postproc = DDS_RAW_YCOCG;
else if (avctx->pix_fmt == AV_PIX_FMT_YA8)
ctx->postproc = DDS_SWAP_ALPHA;
/* ATI/NVidia variants sometimes add swizzling in bpp. */
switch (bpp) {

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 34
#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \

2
tests/ref/fate/dds-ya
View File

@ -3,4 +3,4 @@
#codec_id 0: rawvideo
#dimensions 0: 220x64
#sar 0: 0/1
0, 0, 0, 1, 28160, 0xd3981fcb
0, 0, 0, 1, 28160, 0x5aa41fcb