diff options
Diffstat (limited to 'libavutil/tree.c')
-rw-r--r-- | libavutil/tree.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libavutil/tree.c b/libavutil/tree.c index a65d728f86..7b57b2d39a 100644 --- a/libavutil/tree.c +++ b/libavutil/tree.c @@ -1,24 +1,25 @@ /* * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg 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. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "error.h" +#include "log.h" #include "mem.h" #include "tree.h" @@ -28,13 +29,15 @@ typedef struct AVTreeNode { int state; } AVTreeNode; +const int av_tree_node_size = sizeof(AVTreeNode); + struct AVTreeNode *av_tree_node_alloc(void) { return av_mallocz(sizeof(struct AVTreeNode)); } void *av_tree_find(const AVTreeNode *t, void *key, - int (*cmp)(void *key, const void *b), void *next[2]) + int (*cmp)(const void *key, const void *b), void *next[2]) { if (t) { unsigned int v = cmp(key, t->elem); @@ -54,7 +57,7 @@ void *av_tree_find(const AVTreeNode *t, void *key, } void *av_tree_insert(AVTreeNode **tp, void *key, - int (*cmp)(void *key, const void *b), AVTreeNode **next) + int (*cmp)(const void *key, const void *b), AVTreeNode **next) { AVTreeNode *t = *tp; if (t) { |