diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:29:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:29:29 +0200 |
| commit | be4ae3f532d13deb0916f950d3bbc60c0f04fd85 (patch) | |
| tree | bfd1dc46f68684bc92d3a6c2af93f5ee6307c044 /tests/ref/vsynth/vsynth2-jpeg2000-97 | |
| parent | 0054bbd6648318a2b1e6dd66adb38f5d3acb922d (diff) | |
| parent | a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f (diff) | |
| download | ffmpeg-be4ae3f532d13deb0916f950d3bbc60c0f04fd85.tar.gz | |
Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'
* commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f':
sgi: K&R formatting cosmetics
Conflicts:
libavcodec/sgidec.c
libavcodec/sgienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth/vsynth2-jpeg2000-97')
0 files changed, 0 insertions, 0 deletions