[MPlayer-cvslog] r28578 - in trunk: libmpcodecs/vd_ffmpeg.c libvo/vo_xvmc.c

[iive]

Author: iive
Date: Sun Feb 15 03:38:20 2009
New Revision: 28578

Log:
Now xvmc struct uses magic_id field

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c
   trunk/libvo/vo_xvmc.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Sun Feb 15 03:08:45 2009	(r28577)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sun Feb 15 03:38:20 2009	(r28578)
@@ -959,7 +959,7 @@ static int mc_get_buffer(AVCodecContext 
     if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5))
         mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_get_buffer (render=%p)\n", render);
     assert(render != 0);
-    assert(render->magic == AV_XVMC_RENDER_MAGIC);
+    assert(render->magic_id == AV_XVMC_RENDER_MAGIC);
     render->state |= AV_XVMC_STATE_PREDICTION;
     return 0;
 }
@@ -986,7 +986,7 @@ static void mc_release_buffer(AVCodecCon
     if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5))
         mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_release_buffer (render=%p)\n", render);
     assert(render!=NULL);
-    assert(render->magic==AV_XVMC_RENDER_MAGIC);
+    assert(render->magic_id==AV_XVMC_RENDER_MAGIC);
     render->state&=~AV_XVMC_STATE_PREDICTION;
     for(i=0; i<4; i++){
         pic->data[i]= NULL;

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	Sun Feb 15 03:08:45 2009	(r28577)
+++ trunk/libvo/vo_xvmc.c	Sun Feb 15 03:38:20 2009	(r28578)
@@ -371,7 +371,7 @@ static uint32_t xvmc_draw_image(mp_image
 
    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,