Merge "[spatial svc]Multiple frame context feature"

diff --cc test/svc_test.cc
Simple merge

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

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

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

diff --cc vp9/encoder/vp9_svc_layercontext.h
index 0857e39cda8c7ec530d8f104c2a8b2ad9336007b,bc306d3ecf7d974f712a1be7dd63cb00c8ab118a..d475d5fcd4c2234ebf26bb2ab9f23b64429d01f6
--- 1/vp9/encoder/vp9_svc_layercontext.h
--- 2/vp9/encoder/vp9_svc_layercontext.h
+++ b/vp9/encoder/vp9_svc_layercontext.h
@@@ -25,9 -25,10 +25,10 @@@ typedef struct 
    double framerate;
    int avg_frame_size;
    TWO_PASS twopass;
 -  struct vpx_fixed_buf rc_twopass_stats_in;
 +  vpx_fixed_buf_t rc_twopass_stats_in;
    unsigned int current_video_frame_in_layer;
    int is_key_frame;
+   FRAME_TYPE last_frame_type;
    vpx_svc_parameters_t svc_params_received;
    struct lookahead_entry  *alt_ref_source;
    int alt_ref_idx;

diff --cc vp9/vp9_cx_iface.c
Simple merge