diff libmpcodecs/vd_ffmpeg.c @ 28522:fee39b6b62ea

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.

--- a/libmpcodecs/vd_ffmpeg.c	Sat Feb 14 16:39:15 2009 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sat Feb 14 17:18:55 2009 +0000
@@ -27,7 +27,7 @@
 #include "libavcodec/avcodec.h"
 
 #if CONFIG_XVMC
-#include "xvmc_render.h"
+#include "libavcodec/xvmc.h"
 #endif
 
 int avcodec_initialized=0;
@@ -985,8 +985,8 @@
     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 @@
     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;
     }