summaryrefslogtreecommitdiffstats
path: root/playtree.c
diff options
context:
space:
mode:
authoradrian <adrian@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-10 10:39:05 +0000
committeradrian <adrian@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-10 10:39:05 +0000
commit510a5f268cf0a10f3b70800af781c96205f668a1 (patch)
treefd50ecc0d2b72d5900b7bef505f7c2c3ce58fee4 /playtree.c
parent7199cc3c4de2ab5bde7d71dfe860dac996b69563 (diff)
downloadmpv-510a5f268cf0a10f3b70800af781c96205f668a1.tar.bz2
mpv-510a5f268cf0a10f3b70800af781c96205f668a1.tar.xz
Remove redundant duplicate option handling in the playtree.
Fixes the use of options on the command line which should not override each other (like -vf-add). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29768 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'playtree.c')
-rw-r--r--playtree.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/playtree.c b/playtree.c
index 06d4c49759..4a017be425 100644
--- a/playtree.c
+++ b/playtree.c
@@ -320,25 +320,15 @@ play_tree_remove_file(play_tree_t* pt,char* file) {
void
play_tree_set_param(play_tree_t* pt, char* name, char* val) {
- int n = 0,ni = -1;
+ int n = 0;
#ifdef MP_DEBUG
assert(pt != NULL);
assert(name != NULL);
#endif
- if(pt->params) {
- for( ; pt->params[n].name != NULL ; n++) {
- if(strcasecmp(pt->params[n].name,name) == 0)
- ni = n;
- }
- }
-
- if(ni > 0) {
- if(pt->params[n].value != NULL) free(pt->params[n].value);
- pt->params[n].value = val != NULL ? strdup(val) : NULL;
- return;
- }
+ if(pt->params)
+ for ( ; pt->params[n].name != NULL ; n++ ) { }
pt->params = (play_tree_param_t*)realloc(pt->params,(n+2)*sizeof(play_tree_param_t));
if(pt->params == NULL) {