From db734715dc7a5913713670293cfbf7fa597f3136 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 23 Mar 2010 19:40:37 +0000 Subject: [PATCH] Fix build due to codecs_path vs. codec_path typo. patch by Erik Auerswald, auerswal unix-ag.uni-kl de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30950 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_realaud.c | 12 ++++++------ libmpcodecs/vd_realvid.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index b3205065a0..4317532d9e 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -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); diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index 00f5983e64..24d68657b2 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -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 */