diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2008-01-04 19:16:38 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2008-01-04 19:16:38 +0000 |
commit | a35bf971c64808763797959a87ab3cf42931c3c2 (patch) | |
tree | af79c49f2c584fae4bb8d8f7445391158ec46cf8 | |
parent | 2e1d2873294a826f673921c0dc5b31f6a6fbbeaa (diff) | |
download | ffmpeg-a35bf971c64808763797959a87ab3cf42931c3c2.tar.gz |
indent
Originally committed as revision 11405 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavutil/tree.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/libavutil/tree.c b/libavutil/tree.c index b821802bc0..e41218fecc 100644 --- a/libavutil/tree.c +++ b/libavutil/tree.c @@ -68,38 +68,38 @@ void *av_tree_insert(AVTreeNode **tp, void *key, int (*cmp)(void *key, const voi return NULL; } } - ret= av_tree_insert(&t->child[v>>31], key, cmp, next); - if(!ret){ - int i= (v>>31) ^ !!*next; - AVTreeNode **child= &t->child[i]; - t->state += 2*i - 1; - - if(!(t->state&1)){ - if(t->state){ - if((*child)->state*2 == -t->state){ - *tp= (*child)->child[i^1]; - (*child)->child[i^1]= (*tp)->child[i]; - (*tp)->child[i]= *child; - *child= (*tp)->child[i^1]; - (*tp)->child[i^1]= t; - - (*tp)->child[0]->state= -((*tp)->state>0); - (*tp)->child[1]->state= (*tp)->state<0 ; - (*tp)->state=0; - }else{ - *tp= *child; - *child= (*child)->child[i^1]; - (*tp)->child[i^1]= t; - if((*tp)->state) t->state = 0; - else t->state>>= 1; - (*tp)->state= -t->state; - } + ret= av_tree_insert(&t->child[v>>31], key, cmp, next); + if(!ret){ + int i= (v>>31) ^ !!*next; + AVTreeNode **child= &t->child[i]; + t->state += 2*i - 1; + + if(!(t->state&1)){ + if(t->state){ + if((*child)->state*2 == -t->state){ + *tp= (*child)->child[i^1]; + (*child)->child[i^1]= (*tp)->child[i]; + (*tp)->child[i]= *child; + *child= (*tp)->child[i^1]; + (*tp)->child[i^1]= t; + + (*tp)->child[0]->state= -((*tp)->state>0); + (*tp)->child[1]->state= (*tp)->state<0 ; + (*tp)->state=0; + }else{ + *tp= *child; + *child= (*child)->child[i^1]; + (*tp)->child[i^1]= t; + if((*tp)->state) t->state = 0; + else t->state>>= 1; + (*tp)->state= -t->state; } } - if(!(*tp)->state ^ !!*next) - return key; } - return ret; + if(!(*tp)->state ^ !!*next) + return key; + } + return ret; }else{ *tp= *next; *next= NULL; (*tp)->elem= key; |