shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Avoid using an anonymous union."

--- a/vpx/internal/vpx_codec_internal.h

+++ b/vpx/internal/vpx_codec_internal.h

@@ -321,7 +321,7 @@

     {

         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;

--- a/vpx/src/vpx_decoder.c

+++ b/vpx/src/vpx_decoder.c

@@ -160,7 +160,7 @@

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

         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;

     }