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)
commit1f5755d869b5e9769be6990b3732aee1d8878e66
tree104f94dc5a8ef10225fcace3c2cfe1fe5d9001b9
parentdb75537e251945a06d1ecd6b0d5c9538c9039c58
parentd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184
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>
libavutil/tree.c