[FFmpeg-cvslog] Merge commit '10db1a9bca46b0f760a1263d47142b2f57e195d7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 10:42:40 2013 +0200| [93b3a5edffa30db752b9780f4c30ccfbe849afce] | committer: Michael Niedermayer

Merge commit '10db1a9bca46b0f760a1263d47142b2f57e195d7'

* commit '10db1a9bca46b0f760a1263d47142b2f57e195d7':
  avutil/tree: K&R formatting cosmetics

Conflicts:
	libavutil/tree.c

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

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