commit e3912d560bb83aaffde2729da8810ffa1b161d5d
author Urvang Joshi <urvang@google.com> Tue Apr 19 16:13:45 2016 -0700
committer Urvang Joshi <urvang@google.com> Tue Apr 19 16:13:45 2016 -0700
tree 7817ed643f3c8a1b0ca546e302c421d38ba79850
parent 6e12e1e3d2a86a8e86ec5f7b6ac3ae5673d22674

WebPAnimEncoder: Restore canvas before evaluating blending possibility.

Without this, the canvas may have been modified in-between two
GenerateCandidate() calls.

Change-Id: I0364a269caabdf282c30a8fa3c61896f0247342e

src/mux/anim_encode.c

diff --git a/src/mux/anim_encode.c b/src/mux/anim_encode.c
index 44f63ef..79aaa87 100644
--- a/src/mux/anim_encode.c
+++ b/src/mux/anim_encode.c
@@ -873,10 +873,14 @@
   WebPPicture* const curr_canvas = &enc->curr_canvas_copy_;
   const WebPPicture* const prev_canvas =
       is_dispose_none ? &enc->prev_canvas_ : &enc->prev_canvas_disposed_;
-  const int use_blending_ll =
+  int use_blending_ll;
+  int use_blending_lossy;
+
+  CopyCurrentCanvas(enc);
+  use_blending_ll =
       !is_key_frame &&
       IsLosslessBlendingPossible(prev_canvas, curr_canvas, &params->rect_ll_);
-  const int use_blending_lossy =
+  use_blending_lossy =
       !is_key_frame &&
       IsLossyBlendingPossible(prev_canvas, curr_canvas, &params->rect_lossy_,
                               config_lossy->quality);