From: Dmitry Kovalev <dkovalev@google.com>
Date: Tue, 15 Apr 2014 17:39:31 +0000 (-0700)
Subject: Merge "Moving frame_frags field from VP9Common to VP9_COMP."
X-Git-Tag: v1.4.0~1799
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55977e4a4f46e6bab09c1832bd67698772020d48;p=libvpx

Merge "Moving frame_frags field from VP9Common to VP9_COMP."
---

55977e4a4f46e6bab09c1832bd67698772020d48
diff --cc vp9/encoder/vp9_onyx_if.c
index 4b2aa8735,988c1c049..03f3c87a2
--- a/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,