Make the Kaiser-Bessel window generator a common function

[ffmpeg] / libavcodec / xvmcvideo.c

diff --git a/libavcodec/xvmcvideo.c b/libavcodec/xvmcvideo.c
index 66905954857a578586682b9980f48af6d365c40b..1a112e1c87eee82ab47dca91bfd86532fb96bd40 100644 (file)
--- a/libavcodec/xvmcvideo.c
+++ b/libavcodec/xvmcvideo.c
@@ -29,10 +29,6 @@
 #undef NDEBUG
 #include <assert.h>
 
-#ifdef USE_FASTMEMCPY
-#include "libvo/fastmemcpy.h"
-#endif
-
 #ifdef HAVE_XVMC
 
 //X11 includes are in the xvmc_render.h
@@ -44,7 +40,7 @@
 //#include "xvmc_debug.h"
 
 //set s->block
-inline void XVMC_init_block(MpegEncContext *s){
+void XVMC_init_block(MpegEncContext *s){
 xvmc_render_state_t * render;
     render = (xvmc_render_state_t*)s->current_picture.data[2];
     assert(render != NULL);
@@ -138,7 +134,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
 
     if(s->encoding){
         av_log(s->avctx, AV_LOG_ERROR, "XVMC doesn't support encoding!!!\n");
-        return -1;
+        return;
     }
 
    //from MPV_decode_mb(),