diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
| commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
| tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /m_option.c | |
| parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
| parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
| download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz | |
Merge svn changes up to r27899
Diffstat (limited to 'm_option.c')
| -rw-r--r-- | m_option.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/m_option.c b/m_option.c index 0b7f69eff2..e3e338808c 100644 --- a/m_option.c +++ b/m_option.c @@ -1468,13 +1468,14 @@ static int parse_obj_params(const m_option_t* opt,const char *name, int r; m_obj_params_t* p = opt->priv; const m_struct_t* desc; - char* cpy = strdup(param); + char* cpy; // We need the object desc if(!p) return M_OPT_INVALID; desc = p->desc; + cpy = strdup(param); r = get_obj_params(name,desc->name,cpy,desc,p->separator,dst ? &opts : NULL); free(cpy); if(r < 0) |