Merge remote branch 'origin/master' into experimental

Change-Id: If95cb994d898d3f29b28db0d118a1f9c973e88d9
This commit is contained in:
John Koleszar 2010-12-02 08:20:43 -05:00
commit ea2a5754b4
2 changed files with 2 additions and 1 deletions

View File

@ -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

View File

@ -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)