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 /mencoder.c | |
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 'mencoder.c')
-rw-r--r-- | mencoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mencoder.c b/mencoder.c index 7ea685ee24..4a8575e75d 100644 --- a/mencoder.c +++ b/mencoder.c @@ -531,14 +531,14 @@ if (frameno_filename) { #endif // check font -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE init_freetype(); #endif -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG if(font_fontconfig <= 0) { #endif -#ifdef HAVE_BITMAP_FONT +#ifdef CONFIG_BITMAP_FONT if(font_name){ vo_font=read_font_desc(font_name,font_factor,verbose>1); if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); @@ -549,7 +549,7 @@ if (frameno_filename) { vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); } #endif -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG } #endif |