libvpx: Pull from upstream

source/libvpx/vpx/vpx_encoder.h

Index: source/libvpx/vpx/vpx_encoder.h
===================================================================
--- source/libvpx/vpx/vpx_encoder.h	(revision 223100)
+++ source/libvpx/vpx/vpx_encoder.h	(working copy)
@@ -46,6 +46,12 @@
   /*!\deprecated Use #VPX_TS_MAX_LAYERS instead. */
 #define MAX_LAYERS      VPX_TS_MAX_LAYERS
 
+/*! Spatial Scalability: Maximum number of coding layers */
+#define VPX_SS_MAX_LAYERS       5
+
+/*! Spatial Scalability: Default number of coding layers */
+#define VPX_SS_DEFAULT_LAYERS       3
+
   /*!\brief Current ABI version number
    *
    * \internal
@@ -217,9 +223,10 @@
 
   /*!\brief Rate control mode */
   enum vpx_rc_mode {
-    VPX_VBR, /**< Variable Bit Rate (VBR) mode */
+    VPX_VBR,  /**< Variable Bit Rate (VBR) mode */
     VPX_CBR,  /**< Constant Bit Rate (CBR) mode */
-    VPX_CQ   /**< Constant Quality  (CQ)  mode */
+    VPX_CQ,   /**< Constrained Quality (CQ)  mode */
+    VPX_Q,    /**< Constant Quality (Q) mode */
   };
 
 
@@ -595,9 +602,15 @@
     unsigned int           kf_max_dist;
 
     /*
-     * Temporal scalability settings (ts)
+     * Spatial scalability settings (ss)
      */
 
+    /*!\brief Number of coding layers (spatial)
+     *
+     * This value specifies the number of coding layers to be used.
+     */
+    unsigned int           ss_number_layers;
+
     /*!\brief Number of coding layers
      *
      * This value specifies the number of coding layers to be used.