Plug memory leak in NUT muxer and demuxer

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

diff --git a/doc/APIchanges b/doc/APIchanges
index 957096ab29c83da7be529be5e49c4bd09dffa13e..e001265b63d5aee285bfb963f466e9df407e8519 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -12,6 +12,9 @@ libavutil:   2009-03-08
 
 API changes, most recent first:
 
+2010-03-03 - r22174 - lavu 50.10.0 - av_tree_enumerate()
+  Add av_tree_enumerate().
+
 2010-02-07 - r21673 - lavu 50.9.0 - av_compare_ts()
   Add av_compare_ts().
 

diff --git a/libavformat/nut.c b/libavformat/nut.c
index be6bcf6a42af28e1e005c8d4138ca76373245d06..d969bbc5269ee0d1111026f5c2676b25ec896ae5 100644 (file)
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -69,6 +69,17 @@ void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts){
     }
 }
 
+static void enu_free(void *opaque, void *elem)
+{
+    av_free(elem);
+}
+
+void ff_nut_free_sp(NUTContext *nut)
+{
+    av_tree_enumerate(nut->syncpoints, NULL, NULL, enu_free);
+    av_tree_destroy(nut->syncpoints);
+}
+
 const Dispositions ff_nut_dispositions[] = {
     {"default"     , AV_DISPOSITION_DEFAULT},
     {"dub"         , AV_DISPOSITION_DUB},

diff --git a/libavformat/nut.h b/libavformat/nut.h
index 35593e97b7b7291309a65d6652447cc342ded90e..8d9695245c8856d3ff8fdbdcd77a6f1720707f53 100644 (file)
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -110,6 +110,7 @@ int64_t ff_lsb2full(StreamContext *stream, int64_t lsb);
 int ff_nut_sp_pos_cmp(Syncpoint *a, Syncpoint *b);
 int ff_nut_sp_pts_cmp(Syncpoint *a, Syncpoint *b);
 void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
+void ff_nut_free_sp(NUTContext *nut);
 
 extern const Dispositions ff_nut_dispositions[];
 

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 171315b7116923dbc96602f8aea02ae6abe16279..6a2d2f8cdae4388b99a4b45bdd3d0e98addf9b2f 100644 (file)
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -901,6 +901,7 @@ static int nut_read_close(AVFormatContext *s)
 
     av_freep(&nut->time_base);
     av_freep(&nut->stream);
+    ff_nut_free_sp(nut);
     for(i = 1; i < nut->header_count; i++)
         av_freep(&nut->header[i]);
 

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 0cce48dea0dfcc50df5b33b389337cc02f43a877..e06a85f54fb3565cd2a250c7bb3d1ec8ea4f45e4 100644 (file)
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -797,6 +797,7 @@ static int write_trailer(AVFormatContext *s){
     while(nut->header_count<3)
         write_headers(nut, bc);
     put_flush_packet(bc);
+    ff_nut_free_sp(nut);
     av_freep(&nut->stream);
     av_freep(&nut->time_base);
 

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index b56f0ed4c2cea0f6f3131240c3d4b35e4b7be3db..b026046b36d2d8c21bbefd762f196e8810838183 100644 (file)
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -40,7 +40,7 @@
 #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
 
 #define LIBAVUTIL_VERSION_MAJOR 50
-#define LIBAVUTIL_VERSION_MINOR  9
+#define LIBAVUTIL_VERSION_MINOR 10
 #define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

diff --git a/libavutil/tree.c b/libavutil/tree.c
index 4b7876462864785b5a67ae52926e74a11a79e466..c387c46deb0746271539c0e6f62f919ede973046 100644 (file)
--- a/libavutil/tree.c
+++ b/libavutil/tree.c
@@ -135,7 +135,6 @@ void av_tree_destroy(AVTreeNode *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){
         int v= cmp ? cmp(opaque, t->elem) : 0;
@@ -144,7 +143,6 @@ void av_tree_enumerate(AVTreeNode *t, void *opaque, int (*cmp)(void *opaque, voi
         if(v<=0) av_tree_enumerate(t->child[1], opaque, cmp, enu);
     }
 }
-#endif
 
 #ifdef TEST
 

diff --git a/libavutil/tree.h b/libavutil/tree.h
index e96d1fa12e5ab7c49ab58656864db69d0e1e1f31..75191f4f7ede37ad29e92f5bb16c19b9f70f4ca1 100644 (file)
--- a/libavutil/tree.h
+++ b/libavutil/tree.h
@@ -79,4 +79,17 @@ 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);
 
+/**
+ * Applies enu(opaque, &elem) to all the elements in the tree in a given range.
+ *
+ * @param cmp a comparison function that returns < 0 for a element below the
+ *            range, > 0 for a element above the range and == 0 for a
+ *            element inside the range
+ *
+ * @note The cmp function should use the same ordering used to construct the
+ *       tree.
+ */
+void av_tree_enumerate(struct AVTreeNode *t, void *opaque, int (*cmp)(void *opaque, void *elem), int (*enu)(void *opaque, void *elem));
+
+
 #endif /* AVUTIL_TREE_H */