[MPlayer-cvslog] r30950 - in trunk/libmpcodecs: ad_realaud.c vd_realvid.c

[diego]

Author: diego
Date: Tue Mar 23 20:40:37 2010
New Revision: 30950

Log:
Fix build due to codecs_path vs. codec_path typo.
patch by Erik Auerswald, auerswal unix-ag.uni-kl de

Modified:
   trunk/libmpcodecs/ad_realaud.c
   trunk/libmpcodecs/vd_realvid.c

Modified: trunk/libmpcodecs/ad_realaud.c
==============================================================================
--- trunk/libmpcodecs/ad_realaud.c	Tue Mar 23 19:01:00 2010	(r30949)
+++ trunk/libmpcodecs/ad_realaud.c	Tue Mar 23 20:40:37 2010	(r30950)
@@ -252,9 +252,9 @@ static int preinit(sh_audio_t *sh){
   unsigned int result;
   char *path;
 
-  path = malloc(strlen(codecs_path) + strlen(sh->codec->dll) + 2);
+  path = malloc(strlen(codec_path) + strlen(sh->codec->dll) + 2);
   if (!path) return 0;
-  sprintf(path, "%s/%s", codecs_path, sh->codec->dll);
+  sprintf(path, "%s/%s", codec_path, sh->codec->dll);
 
     /* first try to load linux dlls, if failed and we're supporting win32 dlls,
        then try to load the windows ones */
@@ -278,8 +278,8 @@ static int preinit(sh_audio_t *sh){
   if(raSetDLLAccessPath){
 #endif
       // used by 'SIPR'
-      path = realloc(path, strlen(codecs_path) + 13);
-      sprintf(path, "DT_Codecs=%s", codecs_path);
+      path = realloc(path, strlen(codec_path) + 13);
+      sprintf(path, "DT_Codecs=%s", codec_path);
       if(path[strlen(path)-1]!='/'){
         path[strlen(path)+1]=0;
         path[strlen(path)]='/';
@@ -301,14 +301,14 @@ static int preinit(sh_audio_t *sh){
 #ifdef CONFIG_WIN32DLL
     if (dll_type == 1){
       if (wraOpenCodec2) {
-        sprintf(path, "%s\\", codecs_path);
+        sprintf(path, "%s\\", codec_path);
         result = wraOpenCodec2(&sh->context, path);
       } else
 	result=wraOpenCodec(&sh->context);
     } else
 #endif
     if (raOpenCodec2) {
-      sprintf(path, "%s/", codecs_path);
+      sprintf(path, "%s/", codec_path);
       result = raOpenCodec2(&sh->context, path);
     } else
       result=raOpenCodec(&sh->context);

Modified: trunk/libmpcodecs/vd_realvid.c
==============================================================================
--- trunk/libmpcodecs/vd_realvid.c	Tue Mar 23 19:01:00 2010	(r30949)
+++ trunk/libmpcodecs/vd_realvid.c	Tue Mar 23 20:40:37 2010	(r30950)
@@ -274,9 +274,9 @@ static int init(sh_video_t *sh){
 
 	mp_msg(MSGT_DECVIDEO,MSGL_V,"realvideo codec id: 0x%08X  sub-id: 0x%08X\n",be2me_32(((unsigned int*)extrahdr)[1]),be2me_32(((unsigned int*)extrahdr)[0]));
 
-	path = malloc(strlen(codecs_path) + strlen(sh->codec->dll) + 2);
+	path = malloc(strlen(codec_path) + strlen(sh->codec->dll) + 2);
 	if (!path) return 0;
-	sprintf(path, "%s/%s", codecs_path, sh->codec->dll);
+	sprintf(path, "%s/%s", codec_path, sh->codec->dll);
 
 	/* first try to load linux dlls, if failed and we're supporting win32 dlls,
 	   then try to load the windows ones */