summaryrefslogtreecommitdiffstats
path: root/parser-mpcmd.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-15 17:05:35 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-15 17:05:35 +0000
commitf10afcba440a8625864972d28432117c8c9561b6 (patch)
tree3dd4b0e79eebe3b4f007f51d756599731c3979ef /parser-mpcmd.c
parent132f2a5ba492231329285102a889c237bd02156e (diff)
downloadmpv-f10afcba440a8625864972d28432117c8c9561b6.tar.bz2
mpv-f10afcba440a8625864972d28432117c8c9561b6.tar.xz
2*10l=20l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8459 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'parser-mpcmd.c')
-rw-r--r--parser-mpcmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/parser-mpcmd.c b/parser-mpcmd.c
index 03560889ef..c407dec03d 100644
--- a/parser-mpcmd.c
+++ b/parser-mpcmd.c
@@ -238,7 +238,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
m_option_t* mp_opt = NULL;
play_tree_t* entry = NULL;
- tmp = (i+1<argc) ? is_entry_option(opt,argv[i + 1],&entry) : 0;
+ tmp = is_entry_option(opt,(i+1<argc) ? argv[i + 1] : NULL,&entry);
if(tmp > 0) { // It's an entry
if(entry) {
add_entry(entry);
@@ -254,7 +254,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
tmp = (i+1<argc) ? m_config_set_option(config, opt, argv[i + 1])
: m_config_set_option(config, opt, NULL);
else {
- tmp = (i+1<argc) ? m_config_check_option(config, opt, argv[i + 1]) : -1;
+ tmp = m_config_check_option(config, opt, (i+1<argc) ? argv[i + 1] : NULL);
if(tmp >= 0 && mode != DROP_LOCAL) {
play_tree_t* pt = last_entry ? last_entry : last_parent;
play_tree_set_param(pt,opt, argv[i + 1]);