RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

The xmvc structure member magic_id was renamed to unique_id. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28601 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-02-15 17:35:24 +00:00
parent b2c338819e
commit 0c4e65f15a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmpcodecs/vd_ffmpeg.c
View File

@ -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->magic_id == AV_XVMC_RENDER_MAGIC);
assert(render->unique_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->magic_id==AV_XVMC_RENDER_MAGIC);
assert(render->unique_id == AV_XVMC_RENDER_MAGIC);
render->state&=~AV_XVMC_STATE_PREDICTION;
}
#endif

8
libvo/vo_xvmc.c
View File

@ -371,7 +371,7 @@ static uint32_t xvmc_draw_image(mp_image_t *mpi){
rndr = (struct xvmc_pixfmt_render*)mpi->priv;//there is copy in plane[2]
assert( rndr != NULL );
assert( rndr->magic_id == AV_XVMC_RENDER_MAGIC );
assert( rndr->unique_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_id = AV_XVMC_RENDER_MAGIC;
surface_render[i].unique_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;
@ -977,7 +977,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_id == AV_XVMC_RENDER_MAGIC );
assert( p_render_surface_to_show->unique_id == AV_XVMC_RENDER_MAGIC );
//fixme assert( p_render_surface_to_show != p_render_surface_visible);
if(use_queue){
@ -1122,7 +1122,7 @@ int rez;
rndr = (struct xvmc_pixfmt_render*)image[2];//this is copy of priv-ate
assert( rndr != NULL );
assert( rndr->magic_id == AV_XVMC_RENDER_MAGIC );
assert( rndr->unique_id == AV_XVMC_RENDER_MAGIC );
rez = XvMCRenderSurface(mDisplay,&ctx,rndr->picture_structure,
rndr->p_surface,