RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix MEncoder build when bitmap fonts are disabled. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19525 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-08-24 16:25:56 +00:00
parent e8686ca1f1
commit 636106aee4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -39,7 +39,6 @@ SRCS_MENCODER = mencoder.c \
mp_msg-mencoder.c \
$(SRCS_COMMON) \
libvo/aclib.c \
libvo/font_load.c \
libvo/osd.c \
libvo/sub.c \
parser-mecmd.c \
@ -247,6 +246,9 @@ COMMON_DEPS += libass/libass.a
COMMON_LIBS += libass/libass.a
PARTS += libass
endif
ifeq ($(BITMAP_FONT),yes)
SRCS_MENCODER += libvo/font_load.c
endif
# FontConfig and FreeType need to come after ASS to avoid link failures on MinGW
COMMON_LIBS += $(FONTCONFIG_LIB)
ifeq ($(FREETYPE),yes)

2
mencoder.c
View File

@ -534,6 +534,7 @@ if (frameno_filename) {
if(!font_fontconfig)
{
#endif
#ifdef HAVE_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);
@ -543,6 +544,7 @@ if (frameno_filename) {
if(!vo_font)
vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
}
#endif
#ifdef HAVE_FONTCONFIG
}
#endif