diff options
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 4 | ||||
| -rw-r--r-- | libvo/vo_xvmc.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 99834d05ad..862c1a776e 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -959,7 +959,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){ 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(AVCodecContext *avctx, AVFrame *pic){ 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; 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, |