vp8: fix up handling of segmentation_maps in reference frames.

[ffmpeg] / libavutil / tree.c

diff --git a/libavutil/tree.c b/libavutil/tree.c
index 07814536852e887df85c89fd4aa48f8cdebe3054..067e5b096e799a7bf3cc3d20240d02d83fd2ccf8 100644 (file)
--- a/libavutil/tree.c
+++ b/libavutil/tree.c
@@ -1,24 +1,23 @@
 /*
  * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * 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