Mercurial > libavcodec.hg
changeset 8910:a11771712f48 libavcodec
Give a little better name to the magic(_id) field in xvmc struct
| author | iive |
|---|---|
| date | Sun, 15 Feb 2009 02:36:43 +0000 |
| parents | 1206da4b90b1 |
| children | 28b706b75b00 |
| files | mpegvideo_xvmc.c xvmc.h |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegvideo_xvmc.c Sun Feb 15 02:27:55 2009 +0000 +++ b/mpegvideo_xvmc.c Sun Feb 15 02:36:43 2009 +0000 @@ -38,7 +38,7 @@ void ff_xvmc_init_block(MpegEncContext *s) { struct xvmc_render_state *render = (struct xvmc_render_state*)s->current_picture.data[2]; - if (!render || render->magic != AV_XVMC_RENDER_MAGIC) { + if (!render || render->magic_id != AV_XVMC_RENDER_MAGIC) { assert(0); return; // make sure that this is a render packet } @@ -69,7 +69,7 @@ struct xvmc_render_state *last, *next, *render = (struct xvmc_render_state*)s->current_picture.data[2]; assert(avctx); - if (!render || render->magic != AV_XVMC_RENDER_MAGIC) + if (!render || render->magic_id != AV_XVMC_RENDER_MAGIC) return -1; // make sure that this is a render packet render->picture_structure = s->picture_structure; @@ -92,7 +92,7 @@ next = (struct xvmc_render_state*)s->next_picture.data[2]; if (!next) return -1; - if (next->magic != AV_XVMC_RENDER_MAGIC) + if (next->magic_id != AV_XVMC_RENDER_MAGIC) return -1; render->p_future_surface = next->p_surface; // no return here, going to set forward prediction @@ -100,7 +100,7 @@ last = (struct xvmc_render_state*)s->last_picture.data[2]; if (!last) last = render; // predict second field from the first - if (last->magic != AV_XVMC_RENDER_MAGIC) + if (last->magic_id != AV_XVMC_RENDER_MAGIC) return -1; render->p_past_surface = last->p_surface; return 0; @@ -154,7 +154,7 @@ // start of XVMC-specific code render = (struct xvmc_render_state*)s->current_picture.data[2]; assert(render); - assert(render->magic == AV_XVMC_RENDER_MAGIC); + assert(render->magic_id == AV_XVMC_RENDER_MAGIC); assert(render->mv_blocks); // take the next free macroblock
--- a/xvmc.h Sun Feb 15 02:27:55 2009 +0000 +++ b/xvmc.h Sun Feb 15 02:36:43 2009 +0000 @@ -36,7 +36,7 @@ struct xvmc_render_state { /** set by calling application */ //@{ - int magic; ///< used as a check against memory corruption by regular pixel routines + int magic_id; ///< used as a check against memory corruption by regular pixel routines or other API structure short* data_blocks; XvMCMacroBlock* mv_blocks;