libvpx: Pull from upstream

source/libvpx/vpx/internal/vpx_codec_internal.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.
  */
 
@@ skipping 136 matching lines @@
  * in the algorithm's control mapping table, and the data parameter may be NULL.
  *
  *
  * \param[in]     ctx              Pointer to this instance's context
  * \param[in]     ctrl_id          Algorithm specific control identifier
  * \param[in,out] data             Data to exchange with algorithm instance.
  *
  * \retval #VPX_CODEC_OK
  *     The internal state data was deserialized.
  */
-typedef vpx_codec_err_t (*vpx_codec_control_fn_t)(vpx_codec_alg_priv_t  *ctx,
-                                                  int                  ctrl_id,
-                                                  va_list              ap);
+typedef vpx_codec_err_t (*vpx_codec_control_fn_t)(vpx_codec_alg_priv_t *ctx,
+                                                  va_list ap);
 
 /*!\brief control function pointer mapping
  *
  * This structure stores the mapping between control identifiers and
  * implementing functions. Each algorithm provides a list of these
  * mappings. This list is searched by the vpx_codec_control() wrapper
  * function to determine which function to invoke. The special
  * value {0, NULL} is used to indicate end-of-list, and must be
  * present. The special value {0, <non-null>} can be used as a catch-all
  * mapping. This implies that ctrl_id values chosen by the algorithm
  * \ref MUST be non-zero.
  */
 typedef const struct vpx_codec_ctrl_fn_map {
-  int                    ctrl_id;
-  vpx_codec_control_fn_t   fn;
+  int ctrl_id;
+  vpx_codec_control_fn_t fn;
 } vpx_codec_ctrl_fn_map_t;
 
 /*!\brief decode data function pointer prototype
  *
  * Processes a buffer of coded data. If the processing results in a new
  * decoded frame becoming available, #VPX_CODEC_CB_PUT_SLICE and
  * #VPX_CODEC_CB_PUT_FRAME events are generated as appropriate. This
  * function is called by the generic vpx_codec_decode() wrapper function,
  * so plugins implementing this interface may trust the input parameters
  * to be properly initialized.
@@ skipping 211 matching lines @@
 {
     unsigned int           mr_total_resolutions;
     unsigned int           mr_encoder_id;
     struct vpx_rational    mr_down_sampling_factor;
     void*                  mr_low_res_mode_info;
 };
 
 #undef VPX_CTRL_USE_TYPE
 #define VPX_CTRL_USE_TYPE(id, typ) \
   static typ id##__value(va_list args) {return va_arg(args, typ);} \
-  static typ id##__convert(void *x)\
-  {\
-    union\
-    {\
-      void *x;\
-      typ   d;\
-    } u;\
-    u.x = x;\
-    return u.d;\
-  }
-
 
 #undef VPX_CTRL_USE_TYPE_DEPRECATED
 #define VPX_CTRL_USE_TYPE_DEPRECATED(id, typ) \
   static typ id##__value(va_list args) {return va_arg(args, typ);} \
-  static typ id##__convert(void *x)\
-  {\
-    union\
-    {\
-      void *x;\
-      typ   d;\
-    } u;\
-    u.x = x;\
-    return u.d;\
-  }
 
 #define CAST(id, arg) id##__value(arg)
-#define RECAST(id, x) id##__convert(x)
-
 
 /* CODEC_INTERFACE convenience macro
  *
  * By convention, each codec interface is a struct with extern linkage, where
  * the symbol is suffixed with _algo. A getter function is also defined to
  * return a pointer to the struct, since in some cases it's easier to work
  * with text symbols than data symbols (see issue #169). This function has
  * the same name as the struct, less the _algo suffix. The CODEC_INTERFACE
  * macro is provided to define this getter function automatically.
  */
@@ skipping 88 matching lines @@
 // Returns #VPX_CODEC_OK on success, #VPX_CODEC_MEM_ERROR otherwise.
 vpx_codec_err_t vpx_validate_mmaps(const vpx_codec_stream_info_t *si,
                                    const vpx_codec_mmap_t *mmaps,
                                    const mem_req_t *mem_reqs, int nreqs,
                                    vpx_codec_flags_t init_flags);
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VPX_INTERNAL_VPX_CODEC_INTERNAL_H_