Skip to content

F
ffmpeg-mt
Commit 9e7adae7 authored by michael's avatar michael
Browse files
Options

indent 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11405 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent bfa3f049
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
libavutil/tree.c
View file @ 9e7adae7
...@@ -68,38 +68,38 @@ void *av_tree_insert(AVTreeNode **tp, void *key, int (*cmp)(void *key, const voi ...@@ -68,38 +68,38 @@ void *av_tree_insert(AVTreeNode **tp, void *key, int (*cmp)(void *key, const voi
return NULL; return NULL;
} }
} }
ret= av_tree_insert(&t->child[v>>31], key, cmp, next); ret= av_tree_insert(&t->child[v>>31], key, cmp, next);
if(!ret){ if(!ret){
int i= (v>>31) ^ !!*next; int i= (v>>31) ^ !!*next;
AVTreeNode **child= &t->child[i]; AVTreeNode **child= &t->child[i];
t->state += 2*i - 1; t->state += 2*i - 1;
if(!(t->state&1)){ if(!(t->state&1)){
if(t->state){ if(t->state){
if((*child)->state*2 == -t->state){ if((*child)->state*2 == -t->state){
*tp= (*child)->child[i^1]; *tp= (*child)->child[i^1];
(*child)->child[i^1]= (*tp)->child[i]; (*child)->child[i^1]= (*tp)->child[i];
(*tp)->child[i]= *child; (*tp)->child[i]= *child;
*child= (*tp)->child[i^1]; *child= (*tp)->child[i^1];
(*tp)->child[i^1]= t; (*tp)->child[i^1]= t;
(*tp)->child[0]->state= -((*tp)->state>0); (*tp)->child[0]->state= -((*tp)->state>0);
(*tp)->child[1]->state= (*tp)->state<0 ; (*tp)->child[1]->state= (*tp)->state<0 ;
(*tp)->state=0; (*tp)->state=0;
}else{ }else{
*tp= *child; *tp= *child;
*child= (*child)->child[i^1]; *child= (*child)->child[i^1];
(*tp)->child[i^1]= t; (*tp)->child[i^1]= t;
if((*tp)->state) t->state = 0; if((*tp)->state) t->state = 0;
else t->state>>= 1; else t->state>>= 1;
(*tp)->state= -t->state; (*tp)->state= -t->state;
}
} }
} }
if(!(*tp)->state ^ !!*next)
return key;
} }
return ret; if(!(*tp)->state ^ !!*next)
return key;
}
return ret;
}else{ }else{
*tp= *next; *next= NULL; *tp= *next; *next= NULL;
(*tp)->elem= key; (*tp)->elem= key;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment