diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 02:38:20 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 02:38:20 +0000 |
| commit | d999d7652db69a1c431ed1414f039b1caf156291 (patch) | |
| tree | 803c4cdfeb8771041da4b8d4fc11d77717b93004 /libvo | |
| parent | ebe578fc77daa10db239bdf6c66a2d35c591c2d9 (diff) | |
| download | mpv-d999d7652db69a1c431ed1414f039b1caf156291.tar.bz2 mpv-d999d7652db69a1c431ed1414f039b1caf156291.tar.xz | |
Now xvmc struct uses magic_id field
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28578 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_xvmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 870d8c6069..d084528d18 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -371,7 +371,7 @@ static uint32_t xvmc_draw_image(mp_image_t *mpi){ 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 @@ int vm = flags & VOFLAG_MODESWITCHING; 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 @@ int i,cfs; 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 @@ int rez; 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, |