Michael Niedermayer be4ae3f532 Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f' ...

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

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

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

2014-04-01 03:29:29 +02:00

1.0 KiB

Raw Blame History

View Raw