diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index b82797d493..d6f298b0f1 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;
     }
 }