Applied DATADIR patch by Vladimir Kushnir

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1354 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 5 insertions, 1 deletions

diff --git a/mplayer.c b/mplayer.c
index 396c05196f..b4390f64dc 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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