[SCM] libav/experimental: fix motion vectors 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 9ac34d947ab26e113a48b10b6f66fc4bd7f1c107
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Aug 13 01:05:19 2007 +0000

    fix motion vectors for old version
    
    Originally committed as revision 10096 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index b82797d..d6f298b 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -248,7 +248,10 @@ static void init_mv(FourXContext *f){
     int i;
 
     for(i=0; i<256; i++){
-        f->mv[i] = mv[i][0] + mv[i][1]*f->current_picture.linesize[0]/2;
+        if(f->version)
+            f->mv[i] = mv[i][0]   + mv[i][1]  *f->current_picture.linesize[0]/2;
+        else
+            f->mv[i] = (i&15) - 8 + ((i>>4)-8)*f->current_picture.linesize[0]/2;
     }
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list