[SCM] libav/experimental: fix type 3 aka skipped blocks for old version
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:05:28 UTC 2013
The following commit has been merged in the experimental branch:
commit 40802d36bc5bb023c1cca9cc0901338eff7c24a2
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Aug 13 01:06:04 2007 +0000
fix type 3 aka skipped blocks for old version
Originally committed as revision 10097 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index d6f298b..ba80a15 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -314,6 +314,8 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, int lo
log2w--;
decode_p_block(f, dst , src , log2w, log2h, stride);
decode_p_block(f, dst + (1<<log2w), src + (1<<log2w), log2w, log2h, stride);
+ }else if(code == 3 && f->version==0){
+ mcdc(dst, src, log2w, h, stride, 1, 0);
}else if(code == 4){
src += f->mv[ *f->bytestream++ ];
mcdc(dst, src, log2w, h, stride, 1, le2me_16(*f->wordstream++));
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list