libvpx: Pull from upstream

source/libvpx/vpx/vpx_encoder.h

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #ifndef VPX_VPX_ENCODER_H_
@@ skipping 619 matching lines @@
     /*
      * Spatial scalability settings (ss)
      */
 
     /*!\brief Number of spatial coding layers.
      *
      * This value specifies the number of spatial coding layers to be used.
      */
     unsigned int           ss_number_layers;
 
-#if CONFIG_SPATIAL_SVC
     /*!\brief Enable auto alt reference flags for each spatial layer.
      *
      * These values specify if auto alt reference frame is enabled for each
      * spatial layer.
      */
     int                    ss_enable_auto_alt_ref[VPX_SS_MAX_LAYERS];
-#endif
 
     /*!\brief Target bitrate for each spatial layer.
      *
      * These values specify the target coding bitrate to be used for each
      * spatial layer.
      */
     unsigned int           ss_target_bitrate[VPX_SS_MAX_LAYERS];
 
     /*!\brief Number of temporal coding layers.
      *
@@ skipping 39 matching lines @@
    *
    * Initializes a encoder context using the given interface. Applications
    * should call the vpx_codec_enc_init convenience macro instead of this
    * function directly, to ensure that the ABI version number parameter
    * is properly initialized.
    *
    * If the library was configured with --disable-multithread, this call
    * is not thread safe and should be guarded with a lock if being used
    * in a multithreaded context.
    *
-   * In XMA mode (activated by setting VPX_CODEC_USE_XMA in the flags
-   * parameter), the storage pointed to by the cfg parameter must be
-   * kept readable and stable until all memory maps have been set.
-   *
    * \param[in]    ctx     Pointer to this instance's context.
    * \param[in]    iface   Pointer to the algorithm interface to use.
    * \param[in]    cfg     Configuration to use, if known. May be NULL.
    * \param[in]    flags   Bitfield of VPX_CODEC_USE_* flags
    * \param[in]    ver     ABI version number. Must be set to
    *                       VPX_ENCODER_ABI_VERSION
    * \retval #VPX_CODEC_OK
    *     The decoder algorithm initialized.
    * \retval #VPX_CODEC_MEM_ERROR
    *     Memory allocation failed.
@@ skipping 13 matching lines @@
   vpx_codec_enc_init_ver(ctx, iface, cfg, flags, VPX_ENCODER_ABI_VERSION)
 
 
   /*!\brief Initialize multi-encoder instance
    *
    * Initializes multi-encoder context using the given interface.
    * Applications should call the vpx_codec_enc_init_multi convenience macro
    * instead of this function directly, to ensure that the ABI version number
    * parameter is properly initialized.
    *
-   * In XMA mode (activated by setting VPX_CODEC_USE_XMA in the flags
-   * parameter), the storage pointed to by the cfg parameter must be
-   * kept readable and stable until all memory maps have been set.
-   *
    * \param[in]    ctx     Pointer to this instance's context.
    * \param[in]    iface   Pointer to the algorithm interface to use.
    * \param[in]    cfg     Configuration to use, if known. May be NULL.
    * \param[in]    num_enc Total number of encoders.
    * \param[in]    flags   Bitfield of VPX_CODEC_USE_* flags
    * \param[in]    dsf     Pointer to down-sampling factors.
    * \param[in]    ver     ABI version number. Must be set to
    *                       VPX_ENCODER_ABI_VERSION
    * \retval #VPX_CODEC_OK
    *     The decoder algorithm initialized.
@@ skipping 213 matching lines @@
    */
   const vpx_image_t *vpx_codec_get_preview_frame(vpx_codec_ctx_t   *ctx);
 
 
   /*!@} - end defgroup encoder*/
 #ifdef __cplusplus
 }
 #endif
 #endif  // VPX_VPX_ENCODER_H_