diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-12 00:05:08 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-12 00:05:09 -0400 |
| commit | 7ff5084f33bfb04228c2add3cf496a0067e48501 (patch) | |
| tree | 123c664523d3561868829b212b828e7eb179ebf3 /vp8/encoder/rdopt.c | |
| parent | c9f8aefe26975eb68664a3aa4a40909679286b25 (diff) | |
| parent | d1abe62d1c5455b32631688d61043f0fd2df44e7 (diff) | |
| download | libvpx-7ff5084f33bfb04228c2add3cf496a0067e48501.tar libvpx-7ff5084f33bfb04228c2add3cf496a0067e48501.tar.gz libvpx-7ff5084f33bfb04228c2add3cf496a0067e48501.tar.bz2 libvpx-7ff5084f33bfb04228c2add3cf496a0067e48501.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: Ib42656b05f2b099f17fd6c2033bbc3445421150c
Diffstat (limited to 'vp8/encoder/rdopt.c')
| -rw-r--r-- | vp8/encoder/rdopt.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 078837595..ea4eafcbe 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, |