Merge "Improved encoder threading"

diff --cc vp8/encoder/encodeframe.c
Simple merge

diff --cc vp8/encoder/onyx_if.c
index 92b2f6fc585b505d8083635b5fd49e96149d95fd,64b8e09a54eecf462fac73b1659efdc1c7ada2d8..6a3f7f6ff0ed67ff2182a88a94f66a98a353c2f3
--- 1/vp8/encoder/onyx_if.c
--- 2/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@@ -4413,8 -4425,8 +4424,8 @@@ static void encode_frame_to_data_rat
      }
  
      // Update the GF useage maps.
-     // Update the GF useage maps.
+     // This is done after completing the compression of a frame when all modes etc. are finalized but before loop filter
 +    // This is done after completing the compression of a frame when all modes etc. are finalized but before loop filter
      vp8_update_gf_useage_maps(cpi, cm, &cpi->mb);
  
      if (cm->frame_type == KEY_FRAME)

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