]> granicus.if.org Git - libvpx/commitdiff
Remove redundant parameters from vp10_txfm_rd_in_plane_supertx()
authorJingning Han <jingning@google.com>
Thu, 11 Feb 2016 19:14:55 +0000 (11:14 -0800)
committerJingning Han <jingning@google.com>
Thu, 11 Feb 2016 19:53:22 +0000 (11:53 -0800)
Change-Id: Icb164403239f88f18fd64de75d4881d33d3ab1cc

vp10/encoder/rdopt.c
vp10/encoder/rdopt.h

index 7ff886854337e03943d2e5ce8a9120fbe3017d67..9287bdb6c819b669bb7c8e852b4ea8fb7252286e 100644 (file)
@@ -805,9 +805,6 @@ static void txfm_rd_in_plane(MACROBLOCK *x,
 
 #if CONFIG_SUPERTX
 void vp10_txfm_rd_in_plane_supertx(MACROBLOCK *x,
-#if CONFIG_VAR_TX
-                                   const VP10_COMP *cpi,
-#endif
                                    int *rate, int64_t *distortion,
                                    int *skippable, int64_t *sse,
                                    int64_t ref_best_rd, int plane,
@@ -820,9 +817,6 @@ void vp10_txfm_rd_in_plane_supertx(MACROBLOCK *x,
 
   vp10_zero(args);
   args.x = x;
-#if CONFIG_VAR_TX
-  args.cpi = cpi;
-#endif
   args.best_rd = ref_best_rd;
   args.use_fast_coef_costing = use_fast_coef_casting;
 
index a6394fa4506625c64215d705528d778e2ff39510..7c7e9ebb3d326154434910c961a47274614bf80a 100644 (file)
@@ -82,9 +82,6 @@ void vp10_tx_block_rd_b(const VP10_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
 #endif
 
 void vp10_txfm_rd_in_plane_supertx(MACROBLOCK *x,
-#if CONFIG_VAR_TX
-                                   const VP10_COMP *cpi,
-#endif  // CONFIG_VAR_TX
                                    int *rate, int64_t *distortion,
                                    int *skippable, int64_t *sse,
                                    int64_t ref_best_rd, int plane,