diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libmenu | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
| download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz | |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/menu.c | 10 | ||||
| -rw-r--r-- | libmenu/vf_menu.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libmenu/menu.c b/libmenu/menu.c index 9ceae087cb..cb02e5bb51 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -40,7 +40,7 @@ menu_info_t* menu_info_list[] = { &menu_info_filesel, &menu_info_txt, &menu_info_console, -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN &menu_info_dvbsel, #endif &menu_info_pref, @@ -220,7 +220,7 @@ int menu_init(struct MPContext *mpctx, struct m_config *mconfig, char* buffer = NULL; int bl = BUF_STEP, br = 0; int f, fd; -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE if(vo_font == NULL) return 0; #endif @@ -413,7 +413,7 @@ static void render_txt(char *txt) } } -#ifdef HAVE_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 HAVE_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 HAVE_FRIBIDI +#ifdef CONFIG_FRIBIDI txt = menu_fribidi(txt); #endif render_txt(txt); diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 0cbf35cf53..cb0af69afa 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -202,7 +202,7 @@ static void uninit(vf_instance_t *vf) { static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE // here is the right place to get screen dimensions if (force_load_font) { force_load_font = 0; |