Merge commit 'e13a9293'

* commit 'e13a9293':
  xl: K&R formatting cosmetics

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

libavcodec/xl.c

@@ -42,7 +42,7 @@ static int decode_frame(AVCodecContext *avctx,
 {
     const uint8_t *buf = avpkt->data;
     int buf_size       = avpkt->size;
-    AVFrame * const p = data;
+    AVFrame *const p   = data;
     uint8_t *Y, *U, *V;
     int i, j, ret;
     int stride;
@@ -80,7 +80,7 @@ static int decode_frame(AVCodecContext *avctx,
             buf -= 4;
             val  = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);
 
-            if(!j)
+            if (!j)
                 y0 = (val & 0x1F) << 2;
             else
                 y0 = y3 + xl_table[val & 0x1F];
@@ -91,12 +91,12 @@ static int decode_frame(AVCodecContext *avctx,
             val >>= 6; /* align to word */
             y3    = y2 + xl_table[val & 0x1F];
             val >>= 5;
-            if(!j)
+            if (!j)
                 c0 = (val & 0x1F) << 2;
             else
                 c0 += xl_table[val & 0x1F];
             val >>= 5;
-            if(!j)
+            if (!j)
                 c1 = (val & 0x1F) << 2;
             else
                 c1 += xl_table[val & 0x1F];