diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
| commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
| tree | f8ba954c698470208a243be3da216f7f54367f46 /libmenu | |
| parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
| parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
| download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz | |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmenu/menu.c b/libmenu/menu.c index 164aa99cd0..9ceae087cb 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -413,7 +413,7 @@ static void render_txt(char *txt) } } -#ifdef CONFIG_FRIBIDI +#ifdef HAVE_FRIBIDI #include <fribidi/fribidi.h> #include "libavutil/common.h" char *menu_fribidi_charset = NULL; @@ -469,7 +469,7 @@ void menu_draw_text(mp_image_t* mpi,char* txt, int x, int y) { return; } -#ifdef CONFIG_FRIBIDI +#ifdef HAVE_FRIBIDI txt = menu_fribidi(txt); #endif render_txt(txt); @@ -503,7 +503,7 @@ void menu_draw_text_full(mp_image_t* mpi,char* txt, return; } -#ifdef CONFIG_FRIBIDI +#ifdef HAVE_FRIBIDI txt = menu_fribidi(txt); #endif render_txt(txt); |