diff options
| author | Gaute Strokkenes <gaute.strokkenes@broadcom.com> | 2011-02-02 15:22:51 +0000 |
|---|---|---|
| committer | Gaute Strokkenes <gaute.strokkenes@broadcom.com> | 2011-02-02 15:22:51 +0000 |
| commit | 72ebafff515b70c55a234055dfc501acc3866f97 (patch) | |
| tree | 278505c49d648c09b899888b5dde1971e55eef9b /vpx | |
| parent | a5ecaca6a79798008975ce84fd53303721642248 (diff) | |
| download | libvpx-72ebafff515b70c55a234055dfc501acc3866f97.tar libvpx-72ebafff515b70c55a234055dfc501acc3866f97.tar.gz libvpx-72ebafff515b70c55a234055dfc501acc3866f97.tar.bz2 libvpx-72ebafff515b70c55a234055dfc501acc3866f97.zip | |
Avoid using an anonymous union.
Change-Id: I5744269a35e2d696ecf40c1665efd572bfc9b6cb
Diffstat (limited to 'vpx')
| -rw-r--r-- | vpx/internal/vpx_codec_internal.h | 2 | ||||
| -rw-r--r-- | vpx/src/vpx_decoder.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h index dcb451dca..9cde42647 100644 --- a/vpx/internal/vpx_codec_internal.h +++ b/vpx/internal/vpx_codec_internal.h @@ -321,7 +321,7 @@ typedef struct vpx_codec_priv_cb_pair { vpx_codec_put_frame_cb_fn_t put_frame; vpx_codec_put_slice_cb_fn_t put_slice; - }; + } u; void *user_priv; } vpx_codec_priv_cb_pair_t; diff --git a/vpx/src/vpx_decoder.c b/vpx/src/vpx_decoder.c index 27049a51e..7b78e5c44 100644 --- a/vpx/src/vpx_decoder.c +++ b/vpx/src/vpx_decoder.c @@ -160,7 +160,7 @@ vpx_codec_err_t vpx_codec_register_put_frame_cb(vpx_codec_ctx_t *ctx res = VPX_CODEC_ERROR; 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; 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; 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; res = VPX_CODEC_OK; } |