diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-06-09 12:15:48 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-06-09 12:15:48 +0000 |
| commit | ed9296d845e754ddc4e91a87b41d7a8b878b6d95 (patch) | |
| tree | 35cca7f63c69d485978ee9179d21c47eaf0cb4c4 /libvo | |
| parent | fbf7cf91621cee937d8a5e87e7afcd1e0fd7c9f1 (diff) | |
| download | mpv-ed9296d845e754ddc4e91a87b41d7a8b878b6d95.tar.bz2 mpv-ed9296d845e754ddc4e91a87b41d7a8b878b6d95.tar.xz | |
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10273 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/font_load.c | 2 | ||||
| -rw-r--r-- | libvo/font_load_ft.c | 2 | ||||
| -rw-r--r-- | libvo/vosub_vidix.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libvo/font_load.c b/libvo/font_load.c index 82d8d6a81b..0cb14f7516 100644 --- a/libvo/font_load.c +++ b/libvo/font_load.c @@ -157,7 +157,7 @@ while(fgets(sor,1020,f)){ } else if(strcmp(section,"[files]")==0){ - char *default_dir=DATADIR"/font"; + char *default_dir=MPLAYER_DATADIR "/font"; if(pdb==2 && strcmp(p[0],"alpha")==0){ char *cp; if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) return NULL; diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 7b38382462..352dbed2f9 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -905,7 +905,7 @@ static int load_sub_face(char *name, FT_Face *face) if (err) { err = FT_New_Face(library, get_path("subfont.ttf"), 0, face); if (err) { - err = FT_New_Face(library, DATADIR"/subfont.ttf", 0, face); + err = FT_New_Face(library, MPLAYER_DATADIR "/subfont.ttf", 0, face); if (err) { mp_msg(MSGT_OSD, MSGL_ERR, "New_Face failed. Maybe the font path is wrong.\nPlease supply the text font file (~/.mplayer/subfont.ttf).\n" ); return -1; diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 370ce64ec5..908ae5fd73 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -709,7 +709,7 @@ int vidix_preinit(const char *drvname,void *server) printf("vosub_vidix: You have wrong version of VIDIX library\n"); return -1; } - vidix_handler = vdlOpen(LIBDIR"/mplayer/vidix/", + vidix_handler = vdlOpen(MPLAYER_LIBDIR "/mplayer/vidix/", drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, TYPE_OUTPUT, verbose); |