4 files changed, 15 insertions, 3 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 8691ba356..8ad7ad2db 100644
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -145,7 +145,6 @@ void update_skip_probs(VP8_COMP *cpi)
             prob_skip_false[k] = 128;
 
         pc->mbskip_pred_probs[k] = prob_skip_false[k];
-        vp8_write_literal(w, prob_skip_false[k], 8);
     }
 
 #else
@@ -765,7 +764,7 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
 
         update_skip_probs( cpi );
         for (k=0;k<MBSKIP_CONTEXTS;++k)
-            vp8_write_literal(w, cpi->prob_skip_false[k], 8);
+            vp8_write_literal(w, pc->mbskip_pred_probs[k], 8);
 #else
         update_skip_probs( cpi );
         vp8_write_literal(w, cpi->prob_skip_false, 8);
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 9e91dd938..e2fed8ed1 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3022,7 +3022,7 @@ static void encode_frame_to_data_rate
 #if CONFIG_HIGH_PRECISION_MV || CONFIG_ENHANCED_INTERP
     if (cm->frame_type != KEY_FRAME)
     {
-        double e = compute_edge_pixel_proportion(cpi->Source);
+        double e = 0; //compute_edge_pixel_proportion(cpi->Source);
 #if CONFIG_HIGH_PRECISION_MV
         /* TODO: Decide this more intelligently */
         xd->allow_high_precision_mv = (Q < HIGH_PRECISION_MV_QTHRESH);
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index 932e8ca7c..703235c33 100644
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -90,6 +90,13 @@ typedef struct
     vp8_prob coef_probs_8x8[BLOCK_TYPES]
                            [COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES];
 
+    vp8_prob ymode_prob [VP8_YMODES-1];   /* interframe intra mode probs */
+#if CONFIG_UVINTRA
+    vp8_prob uv_mode_prob [VP8_YMODES][VP8_UV_MODES-1];
+#else
+    vp8_prob uv_mode_prob [VP8_UV_MODES-1];
+#endif
+
     int mv_ref_ct[6][4][2];
     int mode_context[6][4];
     int mv_ref_ct_a[6][4][2];
diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c
index 1ff13754f..9c7b019aa 100644
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -155,6 +155,9 @@ void vp8_save_coding_context(VP8_COMP *cpi)
     vp8_copy( cc->mv_ref_ct_a, cm->mv_ref_ct_a );
     vp8_copy( cc->mode_context_a, cm->mode_context_a );
 
+    vp8_copy( cc->ymode_prob, cm->fc.ymode_prob );
+    vp8_copy( cc->uv_mode_prob, cm->fc.uv_mode_prob );
+
     // Stats
 #ifdef MODE_STATS
     vp8_copy(cc->y_modes,       y_modes);
@@ -201,6 +204,9 @@ void vp8_restore_coding_context(VP8_COMP *cpi)
     vp8_copy( cm->mv_ref_ct_a, cc->mv_ref_ct_a );
     vp8_copy( cm->mode_context_a, cc->mode_context_a );
 
+    vp8_copy( cm->fc.ymode_prob, cc->ymode_prob);
+    vp8_copy( cm->fc.uv_mode_prob, cc->uv_mode_prob);
+
     // Stats
 #ifdef MODE_STATS
     vp8_copy(y_modes, cc->y_modes);