Revert r22119 and partially revert 22120.
authorVitor Sessak <vitor1001@gmail.com>
Mon, 1 Mar 2010 18:16:10 +0000 (18:16 +0000)
committerVitor Sessak <vitor1001@gmail.com>
Mon, 1 Mar 2010 18:16:10 +0000 (18:16 +0000)
Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/nutdec.c
libavformat/nutenc.c
libavutil/tree.c
libavutil/tree.h

index 415f720..171315b 100644 (file)
@@ -901,7 +901,6 @@ static int nut_read_close(AVFormatContext *s)
 
     av_freep(&nut->time_base);
     av_freep(&nut->stream);
-    av_tree_destroy_free_elem(nut->syncpoints);
     for(i = 1; i < nut->header_count; i++)
         av_freep(&nut->header[i]);
 
index 8509aa2..0cce48d 100644 (file)
@@ -799,7 +799,6 @@ static int write_trailer(AVFormatContext *s){
     put_flush_packet(bc);
     av_freep(&nut->stream);
     av_freep(&nut->time_base);
-    av_tree_destroy_free_elem(nut->syncpoints);
 
     return 0;
 }
index 261e306..4b78764 100644 (file)
@@ -135,15 +135,6 @@ void av_tree_destroy(AVTreeNode *t){
     }
 }
 
-void av_tree_destroy_free_elem(AVTreeNode *t){
-    if(t){
-        av_tree_destroy_free_elem(t->child[0]);
-        av_tree_destroy_free_elem(t->child[1]);
-        av_free(t->elem);
-        av_free(t);
-    }
-}
-
 #if 0
 void av_tree_enumerate(AVTreeNode *t, void *opaque, int (*cmp)(void *opaque, void *elem), int (*enu)(void *opaque, void *elem)){
     if(t){
index e3441c3..e96d1fa 100644 (file)
@@ -78,6 +78,5 @@ void *av_tree_find(const struct AVTreeNode *root, void *key, int (*cmp)(void *ke
  */
 void *av_tree_insert(struct AVTreeNode **rootp, void *key, int (*cmp)(void *key, const void *b), struct AVTreeNode **next);
 void av_tree_destroy(struct AVTreeNode *t);
-void av_tree_destroy_free_elem(struct AVTreeNode *t);
 
 #endif /* AVUTIL_TREE_H */