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