[FFmpeg-cvslog] Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  1 03:29:29 2014 +0200| [be4ae3f532d13deb0916f950d3bbc60c0f04fd85] | committer: Michael Niedermayer

Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'

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

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be4ae3f532d13deb0916f950d3bbc60c0f04fd85
---