diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-23 18:01:00 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-23 18:01:00 +0000 |
| commit | 5e480c7b817748e000caa967711f28eae5e2a3f2 (patch) | |
| tree | 83a6663e3ced7c09afde135341c6760fe761465b /libmpcodecs | |
| parent | cb26eaf0bbcf028e3cf23c912e061268dcbb8127 (diff) | |
| download | mpv-5e480c7b817748e000caa967711f28eae5e2a3f2.tar.bz2 mpv-5e480c7b817748e000caa967711f28eae5e2a3f2.tar.xz | |
Get rid of pointless def_path variable; use codec_path directly instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30949 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_realaud.c | 12 | ||||
| -rw-r--r-- | libmpcodecs/vd_realvid.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vd_xanim.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index 87ff3689b5..b3205065a0 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(def_path) + strlen(sh->codec->dll) + 2); + path = malloc(strlen(codecs_path) + strlen(sh->codec->dll) + 2); if (!path) return 0; - sprintf(path, "%s/%s", def_path, sh->codec->dll); + sprintf(path, "%s/%s", codecs_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(def_path) + 13); - sprintf(path, "DT_Codecs=%s", def_path); + path = realloc(path, strlen(codecs_path) + 13); + sprintf(path, "DT_Codecs=%s", codecs_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\\", def_path); + sprintf(path, "%s\\", codecs_path); result = wraOpenCodec2(&sh->context, path); } else result=wraOpenCodec(&sh->context); } else #endif if (raOpenCodec2) { - sprintf(path, "%s/", def_path); + sprintf(path, "%s/", codecs_path); result = raOpenCodec2(&sh->context, path); } else result=raOpenCodec(&sh->context); diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index 7ddaf811e8..00f5983e64 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(def_path) + strlen(sh->codec->dll) + 2); + path = malloc(strlen(codecs_path) + strlen(sh->codec->dll) + 2); if (!path) return 0; - sprintf(path, "%s/%s", def_path, sh->codec->dll); + sprintf(path, "%s/%s", codecs_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 */ diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c index 70f9306ba3..cca4f23dd5 100644 --- a/libmpcodecs/vd_xanim.c +++ b/libmpcodecs/vd_xanim.c @@ -682,7 +682,7 @@ static int init(sh_video_t *sh) for (i=0; i < XA_CLOSE_FUNCS; i++) xa_close_func[i] = NULL; - snprintf(dll, 1024, "%s/%s", def_path, sh->codec->dll); + snprintf(dll, 1024, "%s/%s", codec_path, sh->codec->dll); if (xacodec_load(sh, dll) == 0) return 0; |