Mercurial > mplayer.hg

diff mencoder.c @ 10272:7b0bc557987b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
author arpi
date Mon, 09 Jun 2003 12:15:48 +0000
parents 531b00ad6f2d
children 008ff00f4223
line wrap: on
line diff
--- a/mencoder.c	Mon Jun 09 12:12:04 2003 +0000
+++ b/mencoder.c	Mon Jun 09 12:15:48 2003 +0000
@@ -377,7 +377,7 @@
 
 // check codec.conf
 if(!parse_codec_cfg(get_path("codecs.conf"))){
-  if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
+  if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
     if(!parse_codec_cfg(NULL)){
       mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
       exit(0);
@@ -443,7 +443,7 @@
       // try default:
        vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
        if(!vo_font)
-       vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
+       vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
   }
 #endif
 #endif