diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:42:20 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:42:20 +0300 |
| commit | 4785c2617ee9ac186464a55c1bfb13a5781ef041 (patch) | |
| tree | 2424f18b68b2037bd4e290471821e9adae28b876 /libmpcodecs/vd_xanim.c | |
| parent | 2732d5efbae3e0ee28bc6b70ceab1eb77e593216 (diff) | |
| parent | 38abe6ff7a3810f8e01b6296570e92df1b12b09c (diff) | |
| download | mpv-4785c2617ee9ac186464a55c1bfb13a5781ef041.tar.bz2 mpv-4785c2617ee9ac186464a55c1bfb13a5781ef041.tar.xz | |
Merge svn changes up to r30967
Diffstat (limited to 'libmpcodecs/vd_xanim.c')
| -rw-r--r-- | libmpcodecs/vd_xanim.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c index c756c8b8b7..da61f73245 100644 --- a/libmpcodecs/vd_xanim.c +++ b/libmpcodecs/vd_xanim.c @@ -29,7 +29,7 @@ #include <string.h> /* strerror */ #include "config.h" - +#include "path.h" #include "mp_msg.h" #include "vd_internal.h" @@ -649,7 +649,6 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ static int init(sh_video_t *sh) { vd_xanim_ctx *priv; - char *def_path = BINARY_CODECS_PATH; char dll[1024]; XA_CODEC_HDR codec_hdr; int i; @@ -668,10 +667,7 @@ static int init(sh_video_t *sh) for (i=0; i < XA_CLOSE_FUNCS; i++) xa_close_func[i] = NULL; - if (getenv("XANIM_MOD_DIR")) - def_path = getenv("XANIM_MOD_DIR"); - - 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; |