diff options
| author | Jingning Han <jingning@google.com> | 2014-08-14 18:50:16 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-14 18:50:16 -0700 |
| commit | 80e5550723c60111ed77b00cf9b387846392cdef (patch) | |
| tree | eca14c5050e19d85a6e17963f0543cd5c3e1ba6b /vp9 | |
| parent | 2ba201fcdb93656867d084d06d6522c820263a5e (diff) | |
| parent | d67b608c5dd69ff8edf3c7068c59a2521898bcdf (diff) | |
| download | libvpx-80e5550723c60111ed77b00cf9b387846392cdef.tar libvpx-80e5550723c60111ed77b00cf9b387846392cdef.tar.gz libvpx-80e5550723c60111ed77b00cf9b387846392cdef.tar.bz2 libvpx-80e5550723c60111ed77b00cf9b387846392cdef.zip | |
Merge "Remove redundant vp9_init_plane_quantizers call"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 4e7b8e4a2..a797c85ce 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -539,10 +539,9 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx, } // Else for cyclic refresh mode update the segment map, set the segment id // and then update the quantizer. - else if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) { + if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) { vp9_cyclic_refresh_update_segment(cpi, &xd->mi[0]->mbmi, mi_row, mi_col, bsize, 1); - vp9_init_plane_quantizers(cpi, x); } } |