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/encodemb.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/encodemb.c')
| -rw-r--r-- | vp8/encoder/encodemb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c index e18b85e43..6193736c7 100644 --- a/vp8/encoder/encodemb.c +++ b/vp8/encoder/encodemb.c @@ -19,6 +19,7 @@ #include "vp8/common/reconintra.h" #include "dct.h" #include "vpx_mem/vpx_mem.h" +#include "rdopt.h" #if CONFIG_RUNTIME_CPU_DETECT #define IF_RTCD(x) (x) @@ -230,7 +231,6 @@ void vp8_stuff_inter16x16(MACROBLOCK *x) } #if !(CONFIG_REALTIME_ONLY) -#define RDCOST(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) ) #define RDTRUNC(RM,DM,R,D) ( (128+(R)*(RM)) & 0xFF ) typedef struct vp8_token_state vp8_token_state; |