Changeset 10e931d5 in ffmpeg

Timestamp:

Mar 25, 2014, 6:17:38 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

41e7e46c

Parents:

2d9821a2 (diff), 6ee55c7b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'

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

Conflicts:

libavfilter/vf_transpose.c

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

(No files)