5 files changed, 14 insertions, 15 deletions
diff --git a/libvo/aclib.c b/libvo/aclib.c
index e3457e3bf1..68548f579e 100644
--- a/libvo/aclib.c
+++ b/libvo/aclib.c
@@ -1,5 +1,5 @@
 #include "config.h"
-#ifdef USE_FASTMEMCPY
+#ifdef CONFIG_FASTMEMCPY
 
 /*
   aclib - advanced C library ;)
@@ -180,5 +180,4 @@ void * mem2agpcpy(void * to, const void * from, size_t len)
 	return to;
 }
 
-#endif /* use fastmemcpy */
-
+#endif /* CONFIG_FASTMEMCPY */
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h
index 84d05e2c27..3ac32e3a71 100644
--- a/libvo/fastmemcpy.h
+++ b/libvo/fastmemcpy.h
@@ -23,7 +23,7 @@
 #include <inttypes.h>
 #include <string.h>
 
-#ifdef USE_FASTMEMCPY
+#ifdef CONFIG_FASTMEMCPY
 #if defined(HAVE_MMX) || defined(HAVE_MMX2) || defined(HAVE_3DNOW) \
 /*    || defined(HAVE_SSE) || defined(HAVE_SSE2) */
 #include <stddef.h>
@@ -36,7 +36,7 @@ extern void * mem2agpcpy(void * to, const void * from, size_t len);
 #define fast_memcpy(a,b,c) memcpy(a,b,c)
 #endif
 
-#else /* USE_FASTMEMCPY */
+#else /* CONFIG_FASTMEMCPY */
 #define mem2agpcpy(a,b,c) memcpy(a,b,c)
 #define fast_memcpy(a,b,c) memcpy(a,b,c)
 #endif
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index 96eaa8f354..34749d5232 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -16,7 +16,7 @@
 #include <math.h>
 #include <string.h>
 
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
 #include <iconv.h>
 #endif
 
@@ -716,7 +716,7 @@ static int generate_tables(font_desc_t *desc, double thickness, double radius)
     return 0;
 }
 
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
 /* decode from 'encoding' to unicode */
 static FT_ULong decode_char(iconv_t *cd, char c) {
     FT_ULong o;
@@ -1009,7 +1009,7 @@ font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_hei
     }
     desc->face_cnt++;
 
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
     if (unicode) {
 	charset_size = prepare_charset_unicode(face, my_charset, my_charcodes);
     } else {
diff --git a/libvo/sub.c b/libvo/sub.c
index aeb68d216b..8b4177f913 100644
--- a/libvo/sub.c
+++ b/libvo/sub.c
@@ -8,7 +8,7 @@
 #include <malloc.h>
 #endif
 
-#ifdef USE_DVDNAV
+#ifdef CONFIG_DVDNAV
 #include "stream/stream.h"
 #include "stream/stream_dvdnav.h"
 #define OSD_NAV_BOX_ALPHA 0x7f
@@ -89,7 +89,7 @@ int sub_visibility=1;
 int sub_bg_color=0; /* subtitles background color */
 int sub_bg_alpha=0;
 int sub_justify=0;
-#ifdef USE_DVDNAV
+#ifdef CONFIG_DVDNAV
 static nav_highlight_t nav_hl;
 #endif
 
@@ -216,7 +216,7 @@ inline static void vo_update_text_osd(mp_osd_obj_t* obj,int dxs,int dys){
         }
 }
 
-#ifdef USE_DVDNAV
+#ifdef CONFIG_DVDNAV
 void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey) {
   nav_hl.sx = sx;
   nav_hl.sy = sy;
@@ -1115,7 +1115,7 @@ int vo_update_osd(int dxs,int dys){
         int vis=obj->flags&OSDFLAG_VISIBLE;
 	obj->flags&=~OSDFLAG_BBOX;
 	switch(obj->type){
-#ifdef USE_DVDNAV
+#ifdef CONFIG_DVDNAV
         case OSDTYPE_DVDNAV:
            vo_update_nav(obj,dxs,dys);
            break;
@@ -1192,7 +1192,7 @@ void vo_init_osd(void){
     new_osd_obj(OSDTYPE_SUBTITLE);
     new_osd_obj(OSDTYPE_PROGBAR);
     new_osd_obj(OSDTYPE_SPU);
-#ifdef USE_DVDNAV
+#ifdef CONFIG_DVDNAV
     new_osd_obj(OSDTYPE_DVDNAV);
 #endif
 #if HAVE_TV_TELETEXT
@@ -1233,7 +1233,7 @@ void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h,
 	case OSDTYPE_SPU:
 	    vo_draw_spudec_sub(obj, draw_alpha); // FIXME
 	    break;
-#ifdef USE_DVDNAV
+#ifdef CONFIG_DVDNAV
         case OSDTYPE_DVDNAV:
 #endif
 #ifdef HAVE_TV_TELETEXT
diff --git a/libvo/sub.h b/libvo/sub.h
index f15b4e6c8d..d0cd9e1360 100644
--- a/libvo/sub.h
+++ b/libvo/sub.h
@@ -129,7 +129,7 @@ extern int vo_osd_changed_flag;
 
 unsigned utf8_get_char(const char **str);
 
-#ifdef USE_DVDNAV
+#ifdef CONFIG_DVDNAV
 #include <inttypes.h>
 void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey);
 #endif