diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-12-22 13:01:05 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2011-12-22 13:01:05 -0800 |
| commit | 03fadc4b20e7c1948b23f383e2a6bc544379e519 (patch) | |
| tree | 5f034730ef8bf598640e5c7dc8b603e890df5ad1 /vp8/encoder/onyx_if.c | |
| parent | d48ea5a2abc838602d2307534b578aafc5485be5 (diff) | |
| parent | 0c2b2c79aed688daf5f4cc1745493b0e4172e57b (diff) | |
| download | libvpx-03fadc4b20e7c1948b23f383e2a6bc544379e519.tar libvpx-03fadc4b20e7c1948b23f383e2a6bc544379e519.tar.gz libvpx-03fadc4b20e7c1948b23f383e2a6bc544379e519.tar.bz2 libvpx-03fadc4b20e7c1948b23f383e2a6bc544379e519.zip | |
Merge "Remove unnecessary ternary constructs"
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index d2b2c3689..6e0254644 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1540,7 +1540,7 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) cpi->active_best_quality = cpi->oxcf.worst_allowed_q; } - cpi->buffered_mode = (cpi->oxcf.optimal_buffer_level > 0) ? 1 : 0; + cpi->buffered_mode = cpi->oxcf.optimal_buffer_level > 0; cpi->cq_target_quality = cpi->oxcf.cq_level; @@ -3800,7 +3800,7 @@ static void encode_frame_to_data_rate else if (Q < q_low) Q = q_low; - Loop = ((Q != last_q)) ? 1 : 0; + Loop = Q != last_q; } // Is the projected frame size out of range and are we allowed to attempt to recode. @@ -3919,8 +3919,8 @@ static void encode_frame_to_data_rate // Clamp cpi->zbin_over_quant cpi->zbin_over_quant = (cpi->zbin_over_quant < zbin_oq_low) ? zbin_oq_low : (cpi->zbin_over_quant > zbin_oq_high) ? zbin_oq_high : cpi->zbin_over_quant; - //Loop = ((Q != last_q) || (last_zbin_oq != cpi->zbin_over_quant)) ? 1 : 0; - Loop = ((Q != last_q)) ? 1 : 0; + //Loop = (Q != last_q) || (last_zbin_oq != cpi->zbin_over_quant); + Loop = Q != last_q; last_zbin_oq = cpi->zbin_over_quant; } else |