diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-13 00:05:07 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-13 00:05:07 -0400 |
| commit | 8b20b578bf15140b3d6042f0114e0718dab0678e (patch) | |
| tree | 211abccf9cde3ddb6b8d03b8cf211c45ab60b6cf /vp8/encoder/encodeframe.c | |
| parent | e7a42e675a7a00921939e0ed6b399fe9a040de85 (diff) | |
| parent | 538f1104078c444f962ed615b873d2d551758843 (diff) | |
| download | libvpx-8b20b578bf15140b3d6042f0114e0718dab0678e.tar libvpx-8b20b578bf15140b3d6042f0114e0718dab0678e.tar.gz libvpx-8b20b578bf15140b3d6042f0114e0718dab0678e.tar.bz2 libvpx-8b20b578bf15140b3d6042f0114e0718dab0678e.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 17ecfd84f..b8a4c366f 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1295,7 +1295,6 @@ int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t) x->e_mbd.mode_info_context->mbmi.ref_frame = INTRA_FRAME; -#if !(CONFIG_REALTIME_ONLY) if (cpi->sf.RD && cpi->compressor_speed != 2) { vp8_rd_pick_intra_mbuv_mode(cpi, x, &rateuv, &rateuv_tokenonly, &distuv); @@ -1308,7 +1307,6 @@ int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t) rate += (Error4x4 < Error16x16) ? rate4x4 : rate16x16; } else -#endif { int rate2, best_distortion; MB_PREDICTION_MODE mode, best_mode = DC_PRED; @@ -1380,8 +1378,6 @@ int vp8cx_encode_inter_macroblock else x->encode_breakout = cpi->oxcf.encode_breakout; -#if !(CONFIG_REALTIME_ONLY) - if (cpi->sf.RD) { int zbin_mode_boost_enabled = cpi->zbin_mode_boost_enabled; @@ -1408,7 +1404,6 @@ int vp8cx_encode_inter_macroblock } else -#endif vp8_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate, &distortion, &intra_error); cpi->prediction_error += distortion; |