diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-26 11:13:48 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-26 11:13:48 +0200 |
| commit | 234c7378ca1991d3389f25927e9e98184dccb4a1 (patch) | |
| tree | 1f7416df64805f8f289d211a37413dc680c7ae00 /libavcodec/dxv.c | |
| parent | d0aec0aae872d00402e6d81d0884ddbcb657c087 (diff) | |
| parent | fb2889691cb7720d2680e188eb6036a35afa2392 (diff) | |
Merge commit 'fb2889691cb7720d2680e188eb6036a35afa2392'
* commit 'fb2889691cb7720d2680e188eb6036a35afa2392':
dxv: Support the original first version
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/dxv.c')
| -rw-r--r-- | libavcodec/dxv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 2ecf61927b..dd6c731499 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 || old_type & 0x2) { + } 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; |