aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-09-22 13:57:57 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-09-24 10:57:20 +0200
commitfb2889691cb7720d2680e188eb6036a35afa2392 (patch)
treec73a38e874ba634d381506c9659bd8d7cf8e60f5
parent588a5619da0d041e55b365f63d0fa9c72bdbd4d3 (diff)
downloadffmpeg-fb2889691cb7720d2680e188eb6036a35afa2392.tar.gz
dxv: Support the original first version
DXV 1.0 provided DXT1 with LZF only. Sample-Id: Orange-Strings-07_640_DXV.mov Reported-by: Carl Eugen Hoyos Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
-rw-r--r--libavcodec/dxv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index 22148a9206..df2b6c6b43 100644
--- a/libavcodec/dxv.c
+++ b/libavcodec/dxv.c
@@ -358,7 +358,7 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_DEBUG, "LZF compression and DXT5 texture ");
ctx->tex_funct = ctx->texdsp.dxt5_block;
ctx->tex_step = 16;
- } else if (old_type & 0x20) {
+ } else if (old_type & 0x20 || version_major == 1) {
av_log(avctx, AV_LOG_DEBUG, "LZF compression and DXT1 texture ");
ctx->tex_funct = ctx->texdsp.dxt1_block;
ctx->tex_step = 8;