Merge "Moving frame_frags field from VP9Common to VP9_COMP."

diff --cc vp9/common/vp9_onyxc_int.h
Simple merge

diff --cc vp9/encoder/vp9_firstpass.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
index 4b2aa87356fc34860971ec6a705c3f6cbd822910,988c1c04924c5981849c37fe5a5e96d9edce1862..03f3c87a21a42114691373bae496e557feccf674
--- 1/vp9/encoder/vp9_onyx_if.c
--- 2/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@@ -2995,17 -3042,8 +2995,17 @@@ int vp9_get_compressed_data(VP9_COMP *c
    }
  #endif
  
-   cm->frame_flags = *frame_flags;
+   cpi->frame_flags = *frame_flags;
  
 +  if (cpi->pass == 2 &&
 +      cm->current_video_frame == 0 &&
 +      cpi->oxcf.allow_spatial_resampling &&
 +      cpi->oxcf.end_usage == USAGE_LOCAL_FILE_PLAYBACK) {
 +    // Internal scaling is triggered on the first frame.
 +    vp9_set_size_literal(cpi, cpi->oxcf.scaled_frame_width,
 +                         cpi->oxcf.scaled_frame_height);
 +  }
 +
    // Reset the frame pointers to the current frame size
    vp9_realloc_frame_buffer(get_frame_new_buffer(cm),
                             cm->width, cm->height,

diff --cc vp9/encoder/vp9_onyx_int.h
Simple merge

diff --cc vp9/encoder/vp9_ratectrl.c
Simple merge