summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Worley <connorbworley@gmail.com>2024-02-11 03:41:57 -0800
committerAnton Khirnov <anton@khirnov.net>2024-02-18 07:33:27 +0100
commita4f019e44ed6c48975109ac34f54e04caffeab86 (patch)
treeeb9a55a5052dc7eab99033800ba35055db558bb9
parent1487f6198c87dc8a31d185ecda9ddf00a59c6c53 (diff)
lavc/dxv: assume DXV2 files use premultiplied alpha
I generated a DXV2 file with an interesting alpha channel using Adobe Media Encoder 2015 and compared decoding it using Resolume Alley and ffmpeg. Similarly to DXV3 files, Alley expects premultiplied alpha and ffmpeg matches its decoding more closely when it does the same. Reference file: https://connorworley.com/dxv2-dxt5.mov Existing FATE tests for DXV2 files do not cover this change. Signed-off-by: Connor Worley <connorbworley@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/dxv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index 9130319d8f..b5553a0c86 100644
--- a/libavcodec/dxv.c
+++ b/libavcodec/dxv.c
@@ -919,7 +919,7 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame,
tag = DXV_FMT_DXT5;
msgtext = "DXT5";
- texdsp_ctx.tex_funct = ctx->texdsp.dxt5_block;
+ texdsp_ctx.tex_funct = ctx->texdsp.dxt4_block;
texdsp_ctx.tex_ratio = 16;
texdsp_ctx.raw_ratio = 16;
} else if (old_type & 0x20 || version_major == 1) {