generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Avoid using an anonymous union."

Browse Source
This commit is contained in:
John Koleszar
2011-02-03 09:08:50 -08:00
committed by Code Review
parent 4aa12b6c5f 72ebafff51
commit 209def2d72
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vpx/internal/vpx_codec_internal.h
View File

@@ -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;

4
vpx/src/vpx_decoder.c
View File

@@ -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
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;
} }