commit 57c83b330ea61dc954a5963a845c5e86b27b086d
author Jingning Han <jingning@google.com> Thu Feb 11 11:14:55 2016 -0800
committer Jingning Han <jingning@google.com> Thu Feb 11 11:53:22 2016 -0800
tree 2e1a61e25dde5757f2fcd28a9b6162047dab728d
parent f70134f729dfe7429fb1e4e3fd68a381bdb47f7a

Remove redundant parameters from vp10_txfm_rd_in_plane_supertx()

Change-Id: Icb164403239f88f18fd64de75d4881d33d3ab1cc

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 7ff8868..9287bdb 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -805,9 +805,6 @@
 
 #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 @@
 
   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;
 

vp10/encoder/rdopt.h

diff --git a/vp10/encoder/rdopt.h b/vp10/encoder/rdopt.h
index a6394fa..7c7e9eb 100644
--- a/vp10/encoder/rdopt.h
+++ b/vp10/encoder/rdopt.h
@@ -82,9 +82,6 @@
 #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,