[FFmpeg-cvslog] Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 25 19:17:38 2014 +0100| [10e931d51477d10cb3507cc5a67fe356bb6c892c] | committer: Michael Niedermayer

Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'

* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
  vf_transpose: K&R formatting cosmetics

Conflicts:
	libavfilter/vf_transpose.c

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

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