[FFmpeg-cvslog] dxv: Support the original first version

Vittorio Giovara git at videolan.org
Sat Sep 26 11:15:52 CEST 2015


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Tue Sep 22 13:57:57 2015 +0200| [fb2889691cb7720d2680e188eb6036a35afa2392] | committer: Vittorio Giovara

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb2889691cb7720d2680e188eb6036a35afa2392
---

 libavcodec/dxv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index 22148a9..df2b6c6 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;



More information about the ffmpeg-cvslog mailing list