diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
| commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
| tree | b09b4c45898be2754f156ebba16fa1054f42788d /libmenu/menu.c | |
| parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
| parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
| download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz | |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'libmenu/menu.c')
| -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 0741f05448..164aa99cd0 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -413,7 +413,7 @@ static void render_txt(char *txt) } } -#ifdef USE_FRIBIDI +#ifdef CONFIG_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 USE_FRIBIDI +#ifdef CONFIG_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 USE_FRIBIDI +#ifdef CONFIG_FRIBIDI txt = menu_fribidi(txt); #endif render_txt(txt); |