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

[diego]

Author: diego
Date: Sun Feb 15 23:02:24 2009
New Revision: 28608

Log:
The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.

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 21:29:29 2009	(r28607)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sun Feb 15 23:02:24 2009	(r28608)
@@ -594,7 +594,7 @@ static int get_buffer(AVCodecContext *av
         if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5))
             mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::get_buffer (xvmc render=%p)\n", render);
         assert(render != 0);
-        assert(render->xvmc_id == AV_XVMC_RENDER_MAGIC);
+        assert(render->xvmc_id == AV_XVMC_ID);
         render->state |= AV_XVMC_STATE_PREDICTION;
     }
 #endif
@@ -683,7 +683,7 @@ static void release_buffer(struct AVCode
             if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5))
                 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::release_buffer (xvmc render=%p)\n", render);
             assert(render!=NULL);
-            assert(render->xvmc_id == AV_XVMC_RENDER_MAGIC);
+            assert(render->xvmc_id == AV_XVMC_ID);
             render->state&=~AV_XVMC_STATE_PREDICTION;
         }
 #endif

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	Sun Feb 15 21:29:29 2009	(r28607)
+++ trunk/libvo/vo_xvmc.c	Sun Feb 15 23:02:24 2009	(r28608)
@@ -368,7 +368,7 @@ static uint32_t xvmc_draw_image(mp_image
 
    rndr = (struct xvmc_pix_fmt*)mpi->priv; //there is copy in plane[2]
    assert( rndr != NULL );
-   assert( rndr->xvmc_id == AV_XVMC_RENDER_MAGIC );
+   assert( rndr->xvmc_id == AV_XVMC_ID );
    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
@@ -525,7 +525,7 @@ int vm = flags & VOFLAG_MODESWITCHING;
       rez=XvMCCreateSurface(mDisplay,&ctx,&surface_array[i]);
       if( rez != Success )
          break;
-      surface_render[i].xvmc_id = AV_XVMC_RENDER_MAGIC;
+      surface_render[i].xvmc_id = AV_XVMC_ID;
       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;
@@ -974,7 +974,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->xvmc_id == AV_XVMC_RENDER_MAGIC );
+   assert( p_render_surface_to_show->xvmc_id == AV_XVMC_ID );
 //fixme   assert( p_render_surface_to_show != p_render_surface_visible);
 
    if(use_queue){
@@ -1119,7 +1119,7 @@ int rez;
 
    rndr = (struct xvmc_pix_fmt*)image[2]; //this is copy of priv-ate
    assert( rndr != NULL );
-   assert( rndr->xvmc_id == AV_XVMC_RENDER_MAGIC );
+   assert( rndr->xvmc_id == AV_XVMC_ID );
 
    rez = XvMCRenderSurface(mDisplay,&ctx,rndr->picture_structure,
                            rndr->p_surface,