diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:06:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:06:03 +0200 |
| commit | 1f5755d869b5e9769be6990b3732aee1d8878e66 (patch) | |
| tree | 104f94dc5a8ef10225fcace3c2cfe1fe5d9001b9 /libavutil | |
| parent | db75537e251945a06d1ecd6b0d5c9538c9039c58 (diff) | |
| parent | d99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184 (diff) | |
| download | ffmpeg-streaming-1f5755d869b5e9769be6990b3732aee1d8878e66.zip ffmpeg-streaming-1f5755d869b5e9769be6990b3732aee1d8878e66.tar.gz | |
Merge commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184'
* commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184':
avutil/tree: Drop debug messages that clutter the output
Conflicts:
libavutil/tree.c
Merge for metadata only, a better solution has been commited that allows the
debug output to be turned on and off
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/tree.c b/libavutil/tree.c index 10f7d59..cdf9bff 100644 --- a/libavutil/tree.c +++ b/libavutil/tree.c @@ -226,6 +226,7 @@ int main(int argc, char **argv) return -1; } av_log(NULL, AV_LOG_DEBUG, "inserting %4d\n", (int)j); + if (!node) node = av_tree_node_alloc(); av_tree_insert(&root, (void *)(j + 1), cmp, &node); |
