Index: source/libvpx/vpx/internal/vpx_codec_internal.h |
=================================================================== |
--- source/libvpx/vpx/internal/vpx_codec_internal.h (revision 278778) |
+++ source/libvpx/vpx/internal/vpx_codec_internal.h (working copy) |
@@ -154,9 +154,8 @@ |
* \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 |
* |
@@ -170,8 +169,8 @@ |
* \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 |
@@ -403,36 +402,13 @@ |
#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 |