Commit 209def2d authored by John Koleszar's avatar John Koleszar Committed by Code Review
Browse files

Merge "Avoid using an anonymous union."

parents 4aa12b6c 72ebafff
...@@ -321,7 +321,7 @@ typedef struct vpx_codec_priv_cb_pair ...@@ -321,7 +321,7 @@ typedef struct vpx_codec_priv_cb_pair
{ {
vpx_codec_put_frame_cb_fn_t put_frame; vpx_codec_put_frame_cb_fn_t put_frame;
vpx_codec_put_slice_cb_fn_t put_slice; vpx_codec_put_slice_cb_fn_t put_slice;
}; } u;
void *user_priv; void *user_priv;
} vpx_codec_priv_cb_pair_t; } vpx_codec_priv_cb_pair_t;
......
...@@ -160,7 +160,7 @@ vpx_codec_err_t vpx_codec_register_put_frame_cb(vpx_codec_ctx_t *ctx ...@@ -160,7 +160,7 @@ vpx_codec_err_t vpx_codec_register_put_frame_cb(vpx_codec_ctx_t *ctx
res = VPX_CODEC_ERROR; res = VPX_CODEC_ERROR;
else else
{ {
ctx->priv->dec.put_frame_cb.put_frame = cb; ctx->priv->dec.put_frame_cb.u.put_frame = cb;
ctx->priv->dec.put_frame_cb.user_priv = user_priv; ctx->priv->dec.put_frame_cb.user_priv = user_priv;
res = VPX_CODEC_OK; res = VPX_CODEC_OK;
} }
...@@ -182,7 +182,7 @@ vpx_codec_err_t vpx_codec_register_put_slice_cb(vpx_codec_ctx_t *ctx ...@@ -182,7 +182,7 @@ vpx_codec_err_t vpx_codec_register_put_slice_cb(vpx_codec_ctx_t *ctx
res = VPX_CODEC_ERROR; res = VPX_CODEC_ERROR;
else else
{ {
ctx->priv->dec.put_slice_cb.put_slice = cb; ctx->priv->dec.put_slice_cb.u.put_slice = cb;
ctx->priv->dec.put_slice_cb.user_priv = user_priv; ctx->priv->dec.put_slice_cb.user_priv = user_priv;
res = VPX_CODEC_OK; res = VPX_CODEC_OK;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment