@@ -27,7 +27,7 @@

 #include <stdarg.h>

 //#include "sub/font_load.h"

-#include "libmpcodecs/img_format.h"

+#include "../img_format.h"

 //#include "vidix/vidix.h"

 #define VO_EVENT_EXPOSE 1

@@ -26,11 +26,11 @@

 #include <malloc.h>

 #endif

-#include "libmpcodecs/img_format.h"

-#include "libmpcodecs/mp_image.h"

+#include "img_format.h"

+#include "mp_image.h"

 #include "libvo/fastmemcpy.h"

-#include "libavutil/mem.h"

+//#include "libavutil/mem.h"

 void mp_image_alloc_planes(mp_image_t *mpi) {

   // IF09 - allocate space for 4. plane delta info - unused

@@ -22,7 +22,17 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#undef printf //FIXME

+#undef fprintf //FIXME

 #include "mp_msg.h"

+#include "libavutil/avutil.h"

+#include "libavutil/avassert.h"

+#undef realloc

+#undef malloc

+#undef free

+#undef rand

+#undef srand

+#undef printf

 //--------- codec's requirements (filled by the codec/vf) ---------

@@ -19,11 +19,11 @@

 #ifndef MPLAYER_VF_H

 #define MPLAYER_VF_H

-#include "m_option.h"

+//#include "m_option.h"

 #include "mp_image.h"

-extern m_obj_settings_t* vf_settings;

-extern const m_obj_list_t vf_obj_list;

+//extern m_obj_settings_t* vf_settings;

+//extern const m_obj_list_t vf_obj_list;

 struct vf_instance;

 struct vf_priv_s;