Mercurial > mplayer.hg
diff libvo/vo_xvmc.c @ 28543:4877f727596c
Now xvmc struct uses magic_id field
author | iive |
---|---|
date | Sun, 15 Feb 2009 02:38:20 +0000 |
parents | ba860e2b7cb5 |
children | e887c2dd6c62 |
line wrap: on
line diff
--- a/libvo/vo_xvmc.c Sun Feb 15 02:08:45 2009 +0000 +++ b/libvo/vo_xvmc.c Sun Feb 15 02:38:20 2009 +0000 @@ -371,7 +371,7 @@ rndr = (struct xvmc_render_state*)mpi->priv;//there is copy in plane[2] assert( rndr != NULL ); - assert( rndr->magic == AV_XVMC_RENDER_MAGIC ); + assert( rndr->magic_id == AV_XVMC_RENDER_MAGIC ); if( mp_msg_test(MSGT_VO,MSGL_DBG4) ) printf("vo_xvmc: draw_image(show rndr=%p)\n",rndr); // the surface have passed vf system without been skiped, it will be displayed @@ -528,7 +528,7 @@ rez=XvMCCreateSurface(mDisplay,&ctx,&surface_array[i]); if( rez != Success ) break; - surface_render[i].magic = AV_XVMC_RENDER_MAGIC; + surface_render[i].magic_id = AV_XVMC_RENDER_MAGIC; surface_render[i].data_blocks = data_blocks.blocks; surface_render[i].mv_blocks = mv_blocks.macro_blocks; surface_render[i].total_number_of_mv_blocks = numblocks; @@ -978,7 +978,7 @@ printf("vo_xvmc: flip_page show(rndr=%p)\n\n",p_render_surface_to_show); if(p_render_surface_to_show == NULL) return; - assert( p_render_surface_to_show->magic == AV_XVMC_RENDER_MAGIC ); + assert( p_render_surface_to_show->magic_id == AV_XVMC_RENDER_MAGIC ); //fixme assert( p_render_surface_to_show != p_render_surface_visible); if(use_queue){ @@ -1123,7 +1123,7 @@ rndr = (struct xvmc_render_state*)image[2];//this is copy of priv-ate assert( rndr != NULL ); - assert( rndr->magic == AV_XVMC_RENDER_MAGIC ); + assert( rndr->magic_id == AV_XVMC_RENDER_MAGIC ); rez = XvMCRenderSurface(mDisplay,&ctx,rndr->picture_structure, rndr->p_surface,