diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-02 17:06:09 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-02 17:06:09 +0000 |
| commit | 339746a776f83e0d8bff0aeb7cc8939aad1c7921 (patch) | |
| tree | 6966f56404d76a1f89b71c052c610e7e10e7697b /libmpcodecs | |
| parent | eec12427d706063ed58c5580e54a78647c4878ca (diff) | |
| download | mpv-339746a776f83e0d8bff0aeb7cc8939aad1c7921.tar.bz2 mpv-339746a776f83e0d8bff0aeb7cc8939aad1c7921.tar.xz | |
Sync with latest round of xvmc changes in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28237 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index dc3aee1060..c59e9f1b8b 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -939,7 +939,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){ 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 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){ 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 @@ static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){ 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 @@ static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){ //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); |