diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-26 23:35:38 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-26 23:35:38 +0100 |
commit | 896d6a7736c82a181bf17eb240f37645f6b7fa91 (patch) | |
tree | a4deb046f9d19f5c37c45278f49057ade8890d39 /doc/examples/README | |
parent | c2871568cffe5c8a32ac7db35febf4267746395b (diff) | |
parent | 50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654 (diff) | |
download | ffmpeg-896d6a7736c82a181bf17eb240f37645f6b7fa91.tar.gz |
Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'
* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
avformat: utils: K&R formatting cosmetics
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/README')
0 files changed, 0 insertions, 0 deletions