From 6e8b982bcc1ff1b647b28d70a5900ed1bb41e52a Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 4 Jan 2008 17:52:16 +0000
Subject: Move *malloc() out of tree.c, that way the code can be used with flat
 arrays which have lower overhead than millions of mallocd() elements.

Originally committed as revision 11399 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavutil/tree.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libavutil/tree.c')

diff --git a/libavutil/tree.c b/libavutil/tree.c
index 6126ffaaa4..5c4f510db8 100644
--- a/libavutil/tree.c
+++ b/libavutil/tree.c
@@ -28,6 +28,8 @@ typedef struct AVTreeNode{
     int state;
 }AVTreeNode;
 
+const int av_tree_node_size = sizeof(AVTreeNode);
+
 void *av_tree_find(const AVTreeNode *t, void *key, int (*cmp)(void *key, const void *b), void *next[2]){
     if(t){
         unsigned int v= cmp(t->elem, key);
@@ -45,14 +47,14 @@ void *av_tree_find(const AVTreeNode *t, void *key, int (*cmp)(void *key, const v
     return NULL;
 }
 
-void *av_tree_insert(AVTreeNode **tp, void *key, int (*cmp)(void *key, const void *b)){
+void *av_tree_insert(AVTreeNode **tp, void *key, int (*cmp)(void *key, const void *b), AVTreeNode **next){
     AVTreeNode *t= *tp;
     if(t){
         unsigned int v= cmp(t->elem, key);
         if(v){
             int i= v>>31;
             AVTreeNode **child= &t->child[i];
-            void *ret= av_tree_insert(child, key, cmp);
+            void *ret= av_tree_insert(child, key, cmp, next);
             if(!ret){
                 t->state -= ((int)v>>31)|1;
                 if(!(t->state&1)){
@@ -83,7 +85,7 @@ void *av_tree_insert(AVTreeNode **tp, void *key, int (*cmp)(void *key, const voi
             return t->elem;
         }
     }else{
-        *tp= av_mallocz(sizeof(AVTreeNode));
+        *tp= *next; *next= NULL;
         (*tp)->elem= key;
         return NULL;
     }
-- 
cgit v1.2.3