Move error code definitions from libavcodec/avcodec.h to

[ffmpeg] / libavutil / tree.c

diff --git a/libavutil/tree.c b/libavutil/tree.c
index 07814536852e887df85c89fd4aa48f8cdebe3054..8769c76b0fef168a02545338cc0366219a067bc3 100644 (file)
--- a/libavutil/tree.c
+++ b/libavutil/tree.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "common.h"
 #include "log.h"
 #include "tree.h"
 
@@ -135,14 +134,14 @@ 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)){
-    int v= cmp ? cmp(opaque, t->elem) : 0;
-    if(v>=0) av_tree_enumerate(t->child[0], opaque, cmp, enu);
-    if(v==0) enu(opaque, t->elem);
-    if(v<=0) av_tree_enumerate(t->child[1], opaque, cmp, enu);
+    if(t){
+        int v= cmp ? cmp(opaque, t->elem) : 0;
+        if(v>=0) av_tree_enumerate(t->child[0], opaque, cmp, enu);
+        if(v==0) enu(opaque, t->elem);
+        if(v<=0) av_tree_enumerate(t->child[1], opaque, cmp, enu);
+    }
 }
-#endif
 
 #ifdef TEST