Merge remote branch 'internal/upstream' into HEAD

diff --cc vp8/encoder/onyx_if.c
index b5e6f87043a36d8afed7f33d39d19fdd0d1f51a2,35e187e545a5d2502751f33ff8140e31938bf849..e2fd622f37fc0e040a7606ee28323edb8247e280
--- 1/vp8/encoder/onyx_if.c
--- 2/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@@ -3380,21 -3236,18 +3380,22 @@@ static void encode_frame_to_data_rat
  
      // Test code for segmentation of gf/arf (0,0)
      //segmentation_test_function((VP8_PTR) cpi);
 +#if CONFIG_SEGMENTATION
 +    cpi->mb.e_mbd.segmentation_enabled = 1;
 +    cpi->mb.e_mbd.update_mb_segmentation_map = 1;
 +#endif
  
- #if CONFIG_REALTIME_ONLY
-     if(cpi->oxcf.auto_key && cm->frame_type != KEY_FRAME)
+     if (cpi->compressor_speed == 2)
      {
-         if(cpi->force_next_frame_intra)
+         if(cpi->oxcf.auto_key && cm->frame_type != KEY_FRAME)
          {
-             cm->frame_type = KEY_FRAME;  /* delayed intra frame */
+             if(cpi->force_next_frame_intra)
+             {
+                 cm->frame_type = KEY_FRAME;  /* delayed intra frame */
+             }
          }
+         cpi->force_next_frame_intra = 0;
      }
-     cpi->force_next_frame_intra = 0;
- #endif
  
      // For an alt ref frame in 2 pass we skip the call to the second pass function that sets the target bandwidth
  #if !(CONFIG_REALTIME_ONLY)

diff --cc vp8/encoder/onyx_int.h
Simple merge