generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert r22119 and partially revert 22120.

Browse Source 
Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak
2010-03-01 18:16:10 +00:00
parent 34a2d9f9af
commit 8a4d067dfc
4 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/nutdec.c
View File

@@ -901,7 +901,6 @@ static int nut_read_close(AVFormatContext *s)
av_freep(&nut->time_base); av_freep(&nut->time_base);
av_freep(&nut->stream); av_freep(&nut->stream);
av_tree_destroy_free_elem(nut->syncpoints);
for(i = 1; i < nut->header_count; i++) for(i = 1; i < nut->header_count; i++)
av_freep(&nut->header[i]); av_freep(&nut->header[i]);

1
libavformat/nutenc.c
View File

@@ -799,7 +799,6 @@ static int write_trailer(AVFormatContext *s){
put_flush_packet(bc); put_flush_packet(bc);
av_freep(&nut->stream); av_freep(&nut->stream);
av_freep(&nut->time_base); av_freep(&nut->time_base);
av_tree_destroy_free_elem(nut->syncpoints);
return 0; return 0;
} }

9
libavutil/tree.c
View 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 #if 0
void av_tree_enumerate(AVTreeNode *t, void *opaque, int (*cmp)(void *opaque, void *elem), int (*enu)(void *opaque, void *elem)){ void av_tree_enumerate(AVTreeNode *t, void *opaque, int (*cmp)(void *opaque, void *elem), int (*enu)(void *opaque, void *elem)){
if(t){ if(t){

1
libavutil/tree.h
View 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_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(struct AVTreeNode *t);
void av_tree_destroy_free_elem(struct AVTreeNode *t);
#endif /* AVUTIL_TREE_H */ #endif /* AVUTIL_TREE_H */