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 /libavcodec/sgi.h | |
| 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 'libavcodec/sgi.h')
| -rw-r--r-- | libavcodec/sgi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/sgi.h b/libavcodec/sgi.h index be17f2e237..5ec891e431 100644 --- a/libavcodec/sgi.h +++ b/libavcodec/sgi.h @@ -1,4 +1,4 @@ - /* +/* * SGI image encoder * Xiaohui Sun <tjnksxh@hotmail.com> * |