diff options
Diffstat (limited to 'vpx/internal')
| -rw-r--r-- | vpx/internal/vpx_codec_internal.h | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h index 83c3308ee..82d2bc3c0 100644 --- a/vpx/internal/vpx_codec_internal.h +++ b/vpx/internal/vpx_codec_internal.h @@ -154,9 +154,8 @@ typedef vpx_codec_err_t (*vpx_codec_get_si_fn_t)(vpx_codec_alg_priv_t *ctx, * \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 * @@ -403,35 +402,12 @@ struct vpx_codec_priv_enc_mr_cfg #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 * |