diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 09:04:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 09:04:22 +0200 |
| commit | 7824b5f6f5b6200f362017960de413748d917a06 (patch) | |
| tree | b425bb95791b010567bf537bb7ab71b936a3ceae /ffmpeg_opt.c | |
| parent | 65c2fe7159f7521bf694b3990a148c71166e38ac (diff) | |
| parent | a66aa0daf290ef157cb3322b034b43d6201c43e9 (diff) | |
| download | ffmpeg-7824b5f6f5b6200f362017960de413748d917a06.tar.gz | |
Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'
* commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9':
vmnc: K&R formatting cosmetics
Conflicts:
libavcodec/vmnc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions