Merge commit 'a7dbfcf6'

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

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

libavcodec/sgi.h

- /*
+/*
  * SGI image encoder
  * Xiaohui Sun <tjnksxh@hotmail.com>
  *

libavcodec/sgidec.c

@@ -122,7 +122,8 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s)
  * @param s the current image state
  * @return 0 if read success, else return error code.
  */
-static int read_uncompressed_sgi(unsigned char* out_buf, SgiState *s)
+static int read_uncompressed_sgi(unsigned char *out_buf,
+                                 SgiState *s)
 {
     int x, y, z;
     unsigned int offset = s->height * s->width * s->bytes_per_channel;

libavcodec/sgienc.c

@@ -216,7 +216,7 @@ AVCodec ff_sgi_encoder = {
     .init      = encode_init,
     .encode2   = encode_frame,
     .close     = encode_close,
-    .pix_fmts       = (const enum AVPixelFormat[]){
+    .pix_fmts  = (const enum AVPixelFormat[]) {
         AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA,
         AV_PIX_FMT_RGB48LE, AV_PIX_FMT_RGB48BE,
         AV_PIX_FMT_RGBA64LE, AV_PIX_FMT_RGBA64BE,