changeset 1646:c3c166ead03a libavcodec

h263 MV prediction doesnt match mpeg4, for some slices configurations (fixes RV20 MVs)
author michael
date Mon, 01 Dec 2003 20:04:14 +0000
parents 901f928ec1f6
children c943c1d2d099
files h263.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/h263.c	Mon Dec 01 15:49:10 2003 +0000
+++ b/h263.c	Mon Dec 01 20:04:14 2003 +0000
@@ -1473,7 +1473,7 @@
         if(block==0){ //most common case
             if(s->mb_x  == s->resync_mb_x){ //rare
                 *px= *py = 0;
-            }else if(s->mb_x + 1 == s->resync_mb_x){ //rare
+            }else if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare
                 C = s->motion_val[xy + off[block] - wrap];
                 if(s->mb_x==0){
                     *px = C[0];
@@ -1487,7 +1487,7 @@
                 *py = A[1];
             }
         }else if(block==1){
-            if(s->mb_x + 1 == s->resync_mb_x){ //rare
+            if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare
                 C = s->motion_val[xy + off[block] - wrap];
                 *px = mid_pred(A[0], 0, C[0]);
                 *py = mid_pred(A[1], 0, C[1]);