Merge "Refactoring on transform types"

vp10/encoder/rd.c

diff --git a/vp10/encoder/rd.c b/vp10/encoder/rd.c
index 999a6ac..dad1d2a 100644
--- a/vp10/encoder/rd.c
+++ b/vp10/encoder/rd.c
@@ -177,6 +177,8 @@
     rdmult = (rdmult * rd_frame_type_factor[frame_type]) >> 7;
     rdmult += ((rdmult * rd_boost_factor[boost_index]) >> 7);
   }
+  if (rdmult < 1)
+    rdmult = 1;
   return (int)rdmult;
 }
 

vp9/encoder/vp9_rd.c

diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c
index 3ee6fbe..2f2f7c1 100644
--- a/vp9/encoder/vp9_rd.c
+++ b/vp9/encoder/vp9_rd.c
@@ -177,6 +177,8 @@
     rdmult = (rdmult * rd_frame_type_factor[frame_type]) >> 7;
     rdmult += ((rdmult * rd_boost_factor[boost_index]) >> 7);
   }
+  if (rdmult < 1)
+    rdmult = 1;
   return (int)rdmult;
 }