Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 01:29:29 +0000 (03:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 01:29:29 +0000 (03:29 +0200)
commitbe4ae3f532d13deb0916f950d3bbc60c0f04fd85
treebfd1dc46f68684bc92d3a6c2af93f5ee6307c044
parent0054bbd6648318a2b1e6dd66adb38f5d3acb922d
parenta7dbfcf6cb6ab8a8981d74332fd02fb90360d22f
Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'

* commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f':
  sgi: K&R formatting cosmetics

Conflicts:
libavcodec/sgidec.c
libavcodec/sgienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sgi.h
libavcodec/sgidec.c
libavcodec/sgienc.c