[FFmpeg-cvslog] Merge commit 'c2e936de07d054bf476e60445b453bf6b4836820'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 11:06:38 2013 +0200| [161054f37b15893a5854874eed87bb4a4561d04a] | committer: Michael Niedermayer

Merge commit 'c2e936de07d054bf476e60445b453bf6b4836820'

* commit 'c2e936de07d054bf476e60445b453bf6b4836820':
  tree-test: Refactor and plug memory leaks

Conflicts:
	libavutil/tree.c

Most of this commit is not merged due to bugs in it

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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