shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge remote branch 'internal/upstream' into HEAD

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -4582,7 +4582,7 @@

     }

     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

--- a/vp8/encoder/ratectrl.c

+++ b/vp8/encoder/ratectrl.c

@@ -326,6 +326,7 @@

         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)