diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 20:29:29 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 20:29:29 +0000 |
| commit | 33f7ff9403a86783d3732d291c88b72dfc69e7a8 (patch) | |
| tree | 18732f4e7e49dc06c2ac1814bc68fb40fd723d32 | |
| parent | 1e8e195442b2203a690d8ada4b892ce9a2cbd2bf (diff) | |
| download | mpv-33f7ff9403a86783d3732d291c88b72dfc69e7a8.tar.bz2 mpv-33f7ff9403a86783d3732d291c88b72dfc69e7a8.tar.xz | |
Reflect ffmpeg change of xvmc struct field to xvmc_id.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28607 b3059339-0415-0410-9bf9-f77b7e298cf2
| -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 7b89f31790..4e718c2650 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -594,7 +594,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ 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->unique_id == AV_XVMC_RENDER_MAGIC); + assert(render->xvmc_id == AV_XVMC_RENDER_MAGIC); render->state |= AV_XVMC_STATE_PREDICTION; } #endif @@ -683,7 +683,7 @@ static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){ 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->unique_id == AV_XVMC_RENDER_MAGIC); + assert(render->xvmc_id == AV_XVMC_RENDER_MAGIC); render->state&=~AV_XVMC_STATE_PREDICTION; } #endif diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 4a75fe8bf9..23d3cfb765 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -368,7 +368,7 @@ static uint32_t xvmc_draw_image(mp_image_t *mpi){ rndr = (struct xvmc_pix_fmt*)mpi->priv; //there is copy in plane[2] assert( rndr != NULL ); - assert( rndr->unique_id == AV_XVMC_RENDER_MAGIC ); + assert( rndr->xvmc_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 @@ -525,7 +525,7 @@ int vm = flags & VOFLAG_MODESWITCHING; rez=XvMCCreateSurface(mDisplay,&ctx,&surface_array[i]); if( rez != Success ) break; - surface_render[i].unique_id = AV_XVMC_RENDER_MAGIC; + surface_render[i].xvmc_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; @@ -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->unique_id == AV_XVMC_RENDER_MAGIC ); + assert( p_render_surface_to_show->xvmc_id == AV_XVMC_RENDER_MAGIC ); //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->unique_id == AV_XVMC_RENDER_MAGIC ); + assert( rndr->xvmc_id == AV_XVMC_RENDER_MAGIC ); rez = XvMCRenderSurface(mDisplay,&ctx,rndr->picture_structure, rndr->p_surface, |