From: Ronald S. Bultje <rbultje@google.com>
Date: Wed, 6 Feb 2013 01:15:04 +0000 (-0800)
Subject: Fix mismatch after merge of the tiling patch.
X-Git-Tag: v1.3.0~1151^2~206
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=278df745d2d73d71f8d2da8c185c0dde26886bc8;p=libvpx

Fix mismatch after merge of the tiling patch.

Change-Id: I8ecc178b4d4069e721c7fec6d7631c00e4a3e5d5
---

diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 1039d945a..71109f8f4 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -2088,10 +2088,6 @@ void vp9_pack_bitstream(VP9_COMP *cpi, unsigned char *dest,
 
     *size += total_size;
   }
-
-  if (pc->frame_type != KEY_FRAME && !cpi->common.error_resilient_mode) {
-    vp9_adapt_mode_context(&cpi->common);
-  }
 }
 
 #ifdef ENTROPY_STATS