diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-12-02 08:20:43 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-12-02 08:20:43 -0500 |
| commit | ea2a5754b4bc25dbb4ce5eb03bd632dfd756540c (patch) | |
| tree | c69475a33cc114304837cabe1dccc64e52cbe314 | |
| parent | 1b70862916bc33e372f95c725bd24947b0afb308 (diff) | |
| parent | 9c8ad79fdc8af25988dd071703a51d379f2849ce (diff) | |
| download | libvpx-ea2a5754b4bc25dbb4ce5eb03bd632dfd756540c.tar libvpx-ea2a5754b4bc25dbb4ce5eb03bd632dfd756540c.tar.gz libvpx-ea2a5754b4bc25dbb4ce5eb03bd632dfd756540c.tar.bz2 libvpx-ea2a5754b4bc25dbb4ce5eb03bd632dfd756540c.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: If95cb994d898d3f29b28db0d118a1f9c973e88d9
| -rw-r--r-- | vp8/encoder/onyx_if.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/ratectrl.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 52d17a30c..ea72de2de 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4583,7 +4583,7 @@ static void encode_frame_to_data_rate } else { - if (cpi->oxcf.play_alternate && cpi->common.refresh_alt_ref_frame) + if (cpi->oxcf.play_alternate && cpi->common.refresh_alt_ref_frame && (cpi->common.frame_type != KEY_FRAME)) // Update the alternate reference frame and stats as appropriate. update_alt_ref_frame_and_stats(cpi); else diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index c05e80e4b..a7d8f4897 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -326,6 +326,7 @@ void vp8_setup_key_frame(VP8_COMP *cpi) cpi->frames_till_gf_update_due = cpi->goldfreq; cpi->common.refresh_golden_frame = TRUE; + cpi->common.refresh_alt_ref_frame = TRUE; } void vp8_calc_auto_iframe_target_size(VP8_COMP *cpi) |