diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-25 19:17:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-25 19:17:38 +0100 |
| commit | 10e931d51477d10cb3507cc5a67fe356bb6c892c (patch) | |
| tree | adf04818ecf4d7caea3022fb4e871842eac39786 /libavformat/mpegtsenc.c | |
| parent | 2d9821a2081aff5dca253386c6e7e71a04509cff (diff) | |
| parent | 6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3 (diff) | |
| download | ffmpeg-10e931d51477d10cb3507cc5a67fe356bb6c892c.tar.gz | |
Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'
* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
vf_transpose: K&R formatting cosmetics
Conflicts:
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegtsenc.c')
0 files changed, 0 insertions, 0 deletions