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/pickinter.h | |
| 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/pickinter.h')
| -rw-r--r-- | vp8/encoder/pickinter.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vp8/encoder/pickinter.h b/vp8/encoder/pickinter.h index 8fea98397..f96fc5376 100644 --- a/vp8/encoder/pickinter.h +++ b/vp8/encoder/pickinter.h @@ -14,7 +14,6 @@ #include "vpx_ports/config.h" #include "vp8/common/onyxc_int.h" -#define RD_ESTIMATE(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) ) extern int vp8_pick_intra4x4mby_modes(const VP8_ENCODER_RTCD *, MACROBLOCK *mb, int *Rate, int *Distortion); extern void vp8_pick_intra_mbuv_mode(MACROBLOCK *mb); extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra); |