Merge commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:06:03 +0000 (11:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:06:03 +0000 (11:06 +0200)
* 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>
1  2 
libavutil/tree.c

@@@ -225,7 -224,6 +225,8 @@@ int main(int argc, char **argv
              print(root, 0);
              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);