diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-20 00:01:09 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-20 00:01:09 +0000 |
commit | 7882ea9badf366fbb6f06b17ea6321c54c7c8466 (patch) | |
tree | 04f4fb162431a7f43a8f29b1a5bc64575fc72436 /mplayer.c | |
parent | 56c90f534975a3bb9cab5c0b1abda9010f0c50c1 (diff) | |
download | mpv-7882ea9badf366fbb6f06b17ea6321c54c7c8466.tar.bz2 mpv-7882ea9badf366fbb6f06b17ea6321c54c7c8466.tar.xz |
Applied DATADIR patch by Vladimir Kushnir
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1354 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -568,9 +568,11 @@ if(!filename){ // check codec.conf if(!parse_codec_cfg(get_path("codecs.conf"))){ - fprintf(stderr,"(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n"); + if(!parse_codec_cfg(DATADIR"/codecs.conf")){ + printf("(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n"); GUI_MSG( mplCodecConfNotFound ) exit(1); + } } // check font @@ -580,6 +582,8 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ } else { // 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); } // check .sub |