From: James Zern <jzern@google.com>
Date: Tue, 22 Oct 2013 20:08:44 +0000 (-0700)
Subject: Merge "vp9 dec/com: only update frame counts when necessary (2)"
X-Git-Tag: v1.3.0~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5645b2d89b6407117364c02b6278eca78fe5235e;p=libvpx

Merge "vp9 dec/com: only update frame counts when necessary (2)"
---

5645b2d89b6407117364c02b6278eca78fe5235e
diff --cc vp9/decoder/vp9_decodframe.c
index 46bfbe25d,7d0b37b97..36eaff4fc
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@@ -1016,8 -1068,10 +1054,10 @@@ int vp9_decode_frame(VP9D_COMP *pbi, co
  
      if (!frame_is_intra_only(cm)) {
        vp9_adapt_mode_probs(cm);
 -      vp9_adapt_mv_probs(cm, xd->allow_high_precision_mv);
 +      vp9_adapt_mv_probs(cm, cm->allow_high_precision_mv);
      }
+   } else {
+     debug_check_frame_counts(cm);
    }
  
    if (cm->refresh_frame_context)