mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Revert r22119 and partially revert 22120.
Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
34a2d9f9af
commit
8a4d067dfc
@ -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]);
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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){
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user