[Mplayer-cvslog] CVS: main/libmpcodecs dec_audio.c,1.24,1.25 dec_video.c,1.157,1.158

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv3233/libmpcodecs

Modified Files:
	dec_audio.c dec_video.c 
Log Message:
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR


Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dec_audio.c	28 Jan 2003 00:59:34 -0000	1.24
+++ dec_audio.c	9 Jun 2003 12:15:44 -0000	1.25
@@ -160,11 +160,11 @@
 	    ad_functions_t *funcs_sym;
 	    ad_info_t *info_sym;
 	    
-	    buf_len = strlen(LIBDIR)+strlen(sh_audio->codec->drv)+16;
+	    buf_len = strlen(MPLAYER_LIBDIR)+strlen(sh_audio->codec->drv)+16;
 	    buf = malloc(buf_len);
 	    if (!buf)
 		break;
-	    snprintf(buf, buf_len, "%s/mplayer/ad_%s.so", LIBDIR, sh_audio->codec->drv);
+	    snprintf(buf, buf_len, "%s/mplayer/ad_%s.so", MPLAYER_LIBDIR, sh_audio->codec->drv);
 	    mp_msg(MSGT_DECAUDIO, MSGL_DBG2, "Trying to open external plugin: %s\n", buf);
 	    sh_audio->dec_handle = dlopen(buf, RTLD_LAZY);
 	    if (!sh_audio->dec_handle)
@@ -181,7 +181,7 @@
 	    free(buf);
 	    mpadec = funcs_sym;
 	    mp_msg(MSGT_DECAUDIO, MSGL_V, "Using external decoder plugin (%s/mplayer/ad_%s.so)!\n",
-		LIBDIR, sh_audio->codec->drv);
+		MPLAYER_LIBDIR, sh_audio->codec->drv);
 	}
 #endif
 	if(!mpadec){ // driver not available (==compiled in)

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- dec_video.c	14 Feb 2003 21:45:44 -0000	1.157
+++ dec_video.c	9 Jun 2003 12:15:44 -0000	1.158
@@ -187,11 +187,11 @@
 	    vd_functions_t *funcs_sym;
 	    vd_info_t *info_sym;
 
-	    buf_len = strlen(LIBDIR)+strlen(sh_video->codec->drv)+16;
+	    buf_len = strlen(MPLAYER_LIBDIR)+strlen(sh_video->codec->drv)+16;
 	    buf = malloc(buf_len);
 	    if (!buf)
 		break;
-	    snprintf(buf, buf_len, "%s/mplayer/vd_%s.so", LIBDIR, sh_video->codec->drv);
+	    snprintf(buf, buf_len, "%s/mplayer/vd_%s.so", MPLAYER_LIBDIR, sh_video->codec->drv);
 	    mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Trying to open external plugin: %s\n", buf);
 	    sh_video->dec_handle = dlopen(buf, RTLD_LAZY);
 	    if (!sh_video->dec_handle)
@@ -207,7 +207,7 @@
 	    free(buf);
 	    mpvdec = funcs_sym;
 	    mp_msg(MSGT_DECVIDEO, MSGL_V, "Using external decoder plugin (%s/mplayer/vd_%s.so)!\n",
-		LIBDIR, sh_video->codec->drv);
+		MPLAYER_LIBDIR, sh_video->codec->drv);
 	}
 #endif
 	if(!mpvdec){ // driver not available (==compiled in)