From d1abe62d1c5455b32631688d61043f0fd2df44e7 Mon Sep 17 00:00:00 2001 From: Yunqing Wang Date: Thu, 7 Apr 2011 16:57:25 -0400 Subject: Define RDCOST only once Clean up the code. Change-Id: I7db048efa4d972b528d553a7921bc45979621129 --- vp8/encoder/rdopt.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'vp8/encoder/rdopt.c') diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 863b6d419..ef9cce93f 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -31,7 +31,7 @@ #include "vp8/common/g_common.h" #include "variance.h" #include "mcomp.h" - +#include "rdopt.h" #include "vpx_mem/vpx_mem.h" #include "dct.h" #include "vp8/common/systemdependent.h" @@ -46,13 +46,8 @@ extern void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x); extern void vp8_update_zbin_extra(VP8_COMP *cpi, MACROBLOCK *x); - -#define RDCOST(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) ) - #define MAXF(a,b) (((a) > (b)) ? (a) : (b)) - - static const int auto_speed_thresh[17] = { 1000, -- cgit v1.2.3