Browse code

Revert r22119 and partially revert 22120.

Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk

Vitor Sessak authored on 2010/03/02 03:16:10
Showing 4 changed files
... ...
@@ -901,7 +901,6 @@ static int nut_read_close(AVFormatContext *s)
901 901
 
902 902
     av_freep(&nut->time_base);
903 903
     av_freep(&nut->stream);
904
-    av_tree_destroy_free_elem(nut->syncpoints);
905 904
     for(i = 1; i < nut->header_count; i++)
906 905
         av_freep(&nut->header[i]);
907 906
 
... ...
@@ -799,7 +799,6 @@ static int write_trailer(AVFormatContext *s){
799 799
     put_flush_packet(bc);
800 800
     av_freep(&nut->stream);
801 801
     av_freep(&nut->time_base);
802
-    av_tree_destroy_free_elem(nut->syncpoints);
803 802
 
804 803
     return 0;
805 804
 }
... ...
@@ -135,15 +135,6 @@ void av_tree_destroy(AVTreeNode *t){
135 135
     }
136 136
 }
137 137
 
138
-void av_tree_destroy_free_elem(AVTreeNode *t){
139
-    if(t){
140
-        av_tree_destroy_free_elem(t->child[0]);
141
-        av_tree_destroy_free_elem(t->child[1]);
142
-        av_free(t->elem);
143
-        av_free(t);
144
-    }
145
-}
146
-
147 138
 #if 0
148 139
 void av_tree_enumerate(AVTreeNode *t, void *opaque, int (*cmp)(void *opaque, void *elem), int (*enu)(void *opaque, void *elem)){
149 140
     if(t){
... ...
@@ -78,6 +78,5 @@ void *av_tree_find(const struct AVTreeNode *root, void *key, int (*cmp)(void *ke
78 78
  */
79 79
 void *av_tree_insert(struct AVTreeNode **rootp, void *key, int (*cmp)(void *key, const void *b), struct AVTreeNode **next);
80 80
 void av_tree_destroy(struct AVTreeNode *t);
81
-void av_tree_destroy_free_elem(struct AVTreeNode *t);
82 81
 
83 82
 #endif /* AVUTIL_TREE_H */