remove a useless bit of me=umh (originally copied from JM, where it was used for...

[x264] / encoder / macroblock.c

diff --git a/encoder/macroblock.c b/encoder/macroblock.c
index c0967fe0d91b7c8bb660e59d2c28d8dcd5eb8c60..30471f91f2307435d4cce161e83ca38d8010683b 100644 (file)
--- a/encoder/macroblock.c
+++ b/encoder/macroblock.c
@@ -296,17 +296,17 @@ void x264_macroblock_encode_pskip( x264_t *h )
                                 h->mb.mv_min[1], h->mb.mv_max[1] );
 
     /* Motion compensation XXX probably unneeded */
-    h->mc.mc_luma( h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0],
-                   h->mb.pic.p_fdec[0],    FDEC_STRIDE,
+    h->mc.mc_luma( h->mb.pic.p_fdec[0],    FDEC_STRIDE,
+                   h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0],
                    mvx, mvy, 16, 16 );
 
     /* Chroma MC */
-    h->mc.mc_chroma( h->mb.pic.p_fref[0][0][4], h->mb.pic.i_stride[1],
-                     h->mb.pic.p_fdec[1],       FDEC_STRIDE,
+    h->mc.mc_chroma( h->mb.pic.p_fdec[1],       FDEC_STRIDE,
+                     h->mb.pic.p_fref[0][0][4], h->mb.pic.i_stride[1],
                      mvx, mvy, 8, 8 );
 
-    h->mc.mc_chroma( h->mb.pic.p_fref[0][0][5], h->mb.pic.i_stride[2],
-                     h->mb.pic.p_fdec[2],       FDEC_STRIDE,
+    h->mc.mc_chroma( h->mb.pic.p_fdec[2],       FDEC_STRIDE,
+                     h->mb.pic.p_fref[0][0][5], h->mb.pic.i_stride[2],
                      mvx, mvy, 8, 8 );
 
     x264_macroblock_encode_skip( h );
@@ -618,8 +618,8 @@ int x264_macroblock_probe_skip( x264_t *h, const int b_bidir )
         mvp[1] = x264_clip3( h->mb.cache.pskip_mv[1], h->mb.mv_min[1], h->mb.mv_max[1] );
 
         /* Motion compensation */
-        h->mc.mc_luma( h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0],
-                       h->mb.pic.p_fdec[0],    FDEC_STRIDE,
+        h->mc.mc_luma( h->mb.pic.p_fdec[0],    FDEC_STRIDE,
+                       h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0],
                        mvp[0], mvp[1], 16, 16 );
     }
 
@@ -657,8 +657,8 @@ int x264_macroblock_probe_skip( x264_t *h, const int b_bidir )
 
         if( !b_bidir )
         {
-            h->mc.mc_chroma( h->mb.pic.p_fref[0][0][4+ch], h->mb.pic.i_stride[1+ch],
-                             h->mb.pic.p_fdec[1+ch],       FDEC_STRIDE,
+            h->mc.mc_chroma( h->mb.pic.p_fdec[1+ch],       FDEC_STRIDE,
+                             h->mb.pic.p_fref[0][0][4+ch], h->mb.pic.i_stride[1+ch],
                              mvp[0], mvp[1], 8, 8 );
         }
 
@@ -705,7 +705,7 @@ void x264_noise_reduction_update( x264_t *h )
     for( cat = 0; cat < 2; cat++ )
     {
         int size = cat ? 64 : 16;
-        const int *weight = cat ? x264_dct8_weight2_tab : x264_dct4_weight2_tab;
+        const uint16_t *weight = cat ? x264_dct8_weight2_tab : x264_dct4_weight2_tab;
 
         if( h->nr_count[cat] > (cat ? (1<<16) : (1<<18)) )
         {