* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3': vf_transpose: K&R formatting cosmetics Conflicts: libavfilter/vf_transpose.c Merged-by: Michael Niedermayer <michaelni@gmx.at>