Revision aa5ee59e

View differences:

libavcodec/h264_mvpred.h
62 62
            *C = h->mv_cache[list][scan8[0]-2];
63 63

  
64 64
            if(!MB_FIELD
65
               && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){
66
                SET_DIAG_MV(*2, >>1, h->left_mb_xy[0]+s->mb_stride, (s->mb_y&1)*2+(i>>4)-1);
65
               && IS_INTERLACED(h->left_type[0])){
66
                SET_DIAG_MV(*2, >>1, h->left_mb_xy[0]+s->mb_stride, (s->mb_y&1)*2+(i>>5));
67 67
                assert(h->left_mb_xy[0] == h->left_mb_xy[1]);
68 68
            }
69 69
            if(MB_FIELD
70
               && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])){
70
               && !IS_INTERLACED(h->left_type[0])){
71 71
                // left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK.
72
                SET_DIAG_MV(/2, <<1, h->left_mb_xy[i>=36], (- 1 + ((i-scan8[0])>>3)*2)&3);
72
                SET_DIAG_MV(/2, <<1, h->left_mb_xy[i>=36], ((i>>2))&3);
73 73
            }
74 74
        }
75 75
#undef SET_DIAG_MV

Also available in: Unified diff