Merge commit 'fb288969'

* commit 'fb288969':
  dxv: Support the original first version
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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;