Mercurial > libavcodec.hg
changeset 8845:aee8c48ff4b0 libavcodec
Give public #defines that are used by MPlayer an AV_ prefix.
| author | diego |
|---|---|
| date | Sat, 14 Feb 2009 17:12:25 +0000 |
| parents | 9ea7195b2ed4 |
| children | 9e3956a4fd28 |
| files | mpegvideo_xvmc.c xvmc.h |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegvideo_xvmc.c Sat Feb 14 17:04:09 2009 +0000 +++ b/mpegvideo_xvmc.c Sat Feb 14 17:12:25 2009 +0000 @@ -41,7 +41,7 @@ struct xvmc_render_state * render; render = (struct xvmc_render_state*)s->current_picture.data[2]; assert(render); - if (!render || (render->magic != MP_XVMC_RENDER_MAGIC)) { + if (!render || (render->magic != AV_XVMC_RENDER_MAGIC)) { assert(0); return;//make sure that this is a render packet } @@ -75,7 +75,7 @@ render = (struct xvmc_render_state*)s->current_picture.data[2]; assert(render); - if (!render || (render->magic != MP_XVMC_RENDER_MAGIC)) + if (!render || (render->magic != AV_XVMC_RENDER_MAGIC)) return -1;//make sure that this is render packet render->picture_structure = s->picture_structure; @@ -95,7 +95,7 @@ assert(next); if (!next) return -1; - if (next->magic != MP_XVMC_RENDER_MAGIC) + if (next->magic != AV_XVMC_RENDER_MAGIC) return -1; render->p_future_surface = next->p_surface; //no return here, going to set forward prediction @@ -103,7 +103,7 @@ last = (struct xvmc_render_state*)s->last_picture.data[2]; if (!last)// && !s->first_field) last = render;//predict second field from the first - if (last->magic != MP_XVMC_RENDER_MAGIC) + if (last->magic != AV_XVMC_RENDER_MAGIC) return -1; render->p_past_surface = last->p_surface; return 0; @@ -155,7 +155,7 @@ //START OF XVMC specific code render = (struct xvmc_render_state*)s->current_picture.data[2]; assert(render); - assert(render->magic==MP_XVMC_RENDER_MAGIC); + assert(render->magic==AV_XVMC_RENDER_MAGIC); assert(render->mv_blocks); //take the next free macroblock
--- a/xvmc.h Sat Feb 14 17:04:09 2009 +0000 +++ b/xvmc.h Sat Feb 14 17:12:25 2009 +0000 @@ -30,13 +30,13 @@ //the surface should be shown, the video driver manipulates this -#define MP_XVMC_STATE_DISPLAY_PENDING 1 +#define AV_XVMC_STATE_DISPLAY_PENDING 1 //the surface is needed for prediction, the codec manipulates this -#define MP_XVMC_STATE_PREDICTION 2 +#define AV_XVMC_STATE_PREDICTION 2 //this surface is needed for subpicture rendering -#define MP_XVMC_STATE_OSD_SOURCE 4 +#define AV_XVMC_STATE_OSD_SOURCE 4 // 1337 IDCT MCo -#define MP_XVMC_RENDER_MAGIC 0x1DC711C0 +#define AV_XVMC_RENDER_MAGIC 0x1DC711C0 struct xvmc_render_state { //these are not changed by the decoder!