RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
adrian 2009-10-10 10:39:05 +00:00
parent 7199cc3c4d
commit 510a5f268c
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
playtree.c
View File

@ -320,25 +320,15 @@ play_tree_remove_file(play_tree_t* pt,char* file) {
void void
play_tree_set_param(play_tree_t* pt, char* name, char* val) { play_tree_set_param(play_tree_t* pt, char* name, char* val) {
int n = 0,ni = -1; int n = 0;
#ifdef MP_DEBUG #ifdef MP_DEBUG
assert(pt != NULL); assert(pt != NULL);
assert(name != NULL); assert(name != NULL);
#endif #endif
if(pt->params) { if(pt->params)
for( ; pt->params[n].name != NULL ; n++) { 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;
}
pt->params = (play_tree_param_t*)realloc(pt->params,(n+2)*sizeof(play_tree_param_t)); pt->params = (play_tree_param_t*)realloc(pt->params,(n+2)*sizeof(play_tree_param_t));
if(pt->params == NULL) { if(pt->params == NULL) {