diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-14 17:18:55 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-14 17:18:55 +0000 |
| commit | 1538fddadac7e95b23b0a379c33baf7bb28f57a3 (patch) | |
| tree | 9b7477a4e08a3d89e3b0e60a386b239aad0920c8 /libmpcodecs | |
| parent | 060548889799bad3f9fc417c6a22a39783fd66ae (diff) | |
| download | mpv-1538fddadac7e95b23b0a379c33baf7bb28f57a3.tar.bz2 mpv-1538fddadac7e95b23b0a379c33baf7bb28f57a3.tar.xz | |
Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg.
Also adapt MPlayer to definition name changes in libavcodec/xvmc.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28557 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 4f4c7f6c7d..e4d40e3bdc 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -27,7 +27,7 @@ LIBVD_EXTERN(ffmpeg) #include "libavcodec/avcodec.h" #if CONFIG_XVMC -#include "xvmc_render.h" +#include "libavcodec/xvmc.h" #endif int avcodec_initialized=0; @@ -985,8 +985,8 @@ 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 == MP_XVMC_RENDER_MAGIC); - render->state |= MP_XVMC_STATE_PREDICTION; + assert(render->magic == AV_XVMC_RENDER_MAGIC); + render->state |= AV_XVMC_STATE_PREDICTION; return 0; } @@ -1012,8 +1012,8 @@ 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==MP_XVMC_RENDER_MAGIC); - render->state&=~MP_XVMC_STATE_PREDICTION; + assert(render->magic==AV_XVMC_RENDER_MAGIC); + render->state&=~AV_XVMC_STATE_PREDICTION; for(i=0; i<4; i++){ pic->data[i]= NULL; } |