[FFmpeg-cvslog] r22066 - trunk/libavcodec/h264_mvpred.h

[michael]

Author: michael
Date: Fri Feb 26 01:08:27 2010
New Revision: 22066

Log:
Simplify code in mv_pred.
Not benchmarked as this is petty much just code removial.

Modified:
   trunk/libavcodec/h264_mvpred.h

Modified: trunk/libavcodec/h264_mvpred.h
==============================================================================
--- trunk/libavcodec/h264_mvpred.h	Fri Feb 26 00:44:42 2010	(r22065)
+++ trunk/libavcodec/h264_mvpred.h	Fri Feb 26 01:08:27 2010	(r22066)
@@ -62,14 +62,14 @@ static inline int fetch_diagonal_mv(H264
             *C = h->mv_cache[list][scan8[0]-2];
 
             if(!MB_FIELD
-               && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){
-                SET_DIAG_MV(*2, >>1, h->left_mb_xy[0]+s->mb_stride, (s->mb_y&1)*2+(i>>4)-1);
+               && IS_INTERLACED(h->left_type[0])){
+                SET_DIAG_MV(*2, >>1, h->left_mb_xy[0]+s->mb_stride, (s->mb_y&1)*2+(i>>5));
                 assert(h->left_mb_xy[0] == h->left_mb_xy[1]);
             }
             if(MB_FIELD
-               && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])){
+               && !IS_INTERLACED(h->left_type[0])){
                 // left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK.
-                SET_DIAG_MV(/2, <<1, h->left_mb_xy[i>=36], (- 1 + ((i-scan8[0])>>3)*2)&3);
+                SET_DIAG_MV(/2, <<1, h->left_mb_xy[i>=36], ((i>>2))&3);
             }
         }
 #undef SET_DIAG_MV