Mercurial > mplayer.hg
diff libmpcodecs/vd_ffmpeg.c @ 28202:b2e17894b4d0
Sync with latest round of xvmc changes in FFmpeg.
author | diego |
---|---|
date | Fri, 02 Jan 2009 17:06:09 +0000 |
parents | ab477599c7df |
children | 08c1417e757b |
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c Fri Jan 02 16:13:22 2009 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Fri Jan 02 17:06:09 2009 +0000 @@ -939,7 +939,7 @@ sh_video_t * sh = avctx->opaque; vd_ffmpeg_ctx *ctx = sh->context; mp_image_t* mpi=NULL; - xvmc_render_state_t * render; + struct xvmc_render_state * render; int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE| MP_IMGFLAG_DRAW_CALLBACK; @@ -1018,7 +1018,7 @@ pic->type= FF_BUFFER_TYPE_USER; - render=(xvmc_render_state_t*)mpi->priv;//same as data[2] + render=(struct xvmc_render_state*)mpi->priv;//same as data[2] 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); @@ -1032,7 +1032,7 @@ mp_image_t* mpi= pic->opaque; sh_video_t * sh = avctx->opaque; vd_ffmpeg_ctx *ctx = sh->context; - xvmc_render_state_t * render; + struct xvmc_render_state * render; int i; @@ -1045,7 +1045,7 @@ //printf("R%X %X\n", pic->linesize[0], pic->data[0]); //mark the surface as not requared for prediction - render=(xvmc_render_state_t*)pic->data[2];//same as mpi->priv + render=(struct xvmc_render_state*)pic->data[2];//same as mpi->priv 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);