[FFmpeg-cvslog] Merge commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 11:06:03 2013 +0200| [1f5755d869b5e9769be6990b3732aee1d8878e66] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f5755d869b5e9769be6990b3732aee1d8878e66
---