Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Mar 2014 18:17:38 +0000 (19:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Mar 2014 18:17:38 +0000 (19:17 +0100)
commit10e931d51477d10cb3507cc5a67fe356bb6c892c
treeadf04818ecf4d7caea3022fb4e871842eac39786
parent2d9821a2081aff5dca253386c6e7e71a04509cff
parent6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3
Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'

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

Conflicts:
libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_transpose.c