shithub: libvpx

Download patch

ref: 1fefc39e94b556c668146dbf17bcf228c91893e8
parent: b1e3e8348d2102753aab4e24c30dc35189fb941f
parent: e18800443cf76853103e6419bb3b86bf52feec15
author: Marco Paniconi <[email protected]>
date: Wed Aug 19 11:47:40 EDT 2015

Merge "Fix to non-rd variance partition selection."

--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -717,7 +717,8 @@
       yv12_g = get_ref_frame_buffer(cpi, GOLDEN_FRAME);
     }
 
-    if (yv12_g && yv12_g != yv12) {
+    if (yv12_g && yv12_g != yv12 &&
+       (cpi->ref_frame_flags & VP9_GOLD_FLAG)) {
       vp9_setup_pre_planes(xd, 0, yv12_g, mi_row, mi_col,
                            &cm->frame_refs[GOLDEN_FRAME - 1].sf);
       y_sad_g = cpi->fn_ptr[bsize].sdf(x->plane[0].src.buf,