diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-30 17:49:55 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-30 17:49:55 -0700 |
| commit | 79590f186c64468a8c8277000248ae52b81d3571 (patch) | |
| tree | 2d6252437e185653688f473f6f89706cd45c4f61 /vp9/encoder/vp9_rdopt.c | |
| parent | d3764f7f1845034b691e2aa2a27d7a206c375334 (diff) | |
| parent | ee97da2c0317275e12eae68437a5cf212323c4fb (diff) | |
| download | libvpx-79590f186c64468a8c8277000248ae52b81d3571.tar libvpx-79590f186c64468a8c8277000248ae52b81d3571.tar.gz libvpx-79590f186c64468a8c8277000248ae52b81d3571.tar.bz2 libvpx-79590f186c64468a8c8277000248ae52b81d3571.zip | |
Merge "Cleaning up encoder segmentation code." into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 93d30ffcc..da78be14a 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -5604,10 +5604,9 @@ void vp9_pick_mode_inter_macroblock(VP9_COMP *cpi, MACROBLOCK *x, int64_t intra_error = 0; unsigned char *segment_id = &mbmi->segment_id; - if (xd->segmentation_enabled) - x->encode_breakout = cpi->segment_encode_breakout[*segment_id]; - else - x->encode_breakout = cpi->oxcf.encode_breakout; + x->encode_breakout = xd->segmentation_enabled ? + cpi->segment_encode_breakout[*segment_id] : + cpi->oxcf.encode_breakout; // if (cpi->sf.RD) // For now this codebase is limited to a single rd encode path |