0001-cleaned-up-swscale_unscaled.c.patch
diff mbox

Message ID CAOiBWOorZb7SMNp-MQJMcMcbEZH77pJ8JEOYD+wGrRw1JRx-uQ@mail.gmail.com
State Superseded
Headers show

Commit Message

Nathan Adil Maxson Dec. 17, 2011, 8:31 p.m. 
updated patch
-Nathan



On Sat, Dec 17, 2011 at 12:11 PM, Justin Ruggles
<justin.ruggles@gmail.com> wrote:
> On 12/17/2011 02:52 PM, Nathan Maxson wrote:
>
>> -Nathan
>>
>>
>>
>> _______________________________________________
>> libav-devel mailing list
>> libav-devel@libav.org
>> https://lists.libav.org/mailman/listinfo/libav-devel
>
>
> the patch has tabs.
>
> -Justin
>
> _______________________________________________
> libav-devel mailing list
> libav-devel@libav.org
> https://lists.libav.org/mailman/listinfo/libav-devel

Comments

Paul B Mahol Dec. 17, 2011, 8:36 p.m. | #1 
On 12/17/11, Nathan Maxson <nathan0n5ire@gmail.com> wrote:
> updated patch
> -Nathan

Inconsistent spaces around '+=' .

Patch
diff mbox 

From 8fddf8965872ba41339dd7afd5ec4abbe3c7d5b5 Mon Sep 17 00:00:00 2001
From: Nathan Adil Maxson <nathan0n5ire at gmail dot com>
Date: Sat, 17 Dec 2011 11:48:28 -0800
Subject: [PATCH] cleaned up swscale_unscaled.c

---
 libswscale/swscale_unscaled.c |  234 +++++++++++++++++++++++++----------------
 1 files changed, 144 insertions(+), 90 deletions(-)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 3dc2929..f6ff461 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -87,11 +87,12 @@  DECLARE_ALIGNED(8, const uint8_t, dither_8x8_256)[8][8] = {
 #define RV ( (int)(0.500*224/255*(1<<RGB2YUV_SHIFT)+0.5))
 #define RU (-(int)(0.169*224/255*(1<<RGB2YUV_SHIFT)+0.5))
 
-static void fillPlane(uint8_t* plane, int stride, int width, int height, int y, uint8_t val)
+static void fillPlane(uint8_t* plane, int stride, int width, int height, int y,
+                      uint8_t val)
 {
     int i;
     uint8_t *ptr = plane + stride*y;
-    for (i=0; i<height; i++) {
+    for (i = 0; i < height; i++) {
         memset(ptr, val, width);
         ptr += stride;
     }
@@ -106,7 +107,7 @@  static void copyPlane(const uint8_t *src, int srcStride,
         memcpy(dst, src, srcSliceH * dstStride);
     } else {
         int i;
-        for (i=0; i<srcSliceH; i++) {
+        for (i = 0; i < srcSliceH; i++) {
             memcpy(dst, src, width);
             src += srcStride;
             dst += dstStride;
@@ -114,8 +115,10 @@  static void copyPlane(const uint8_t *src, int srcStride,
     }
 }
 
-static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY,
+                               int srcSliceH, uint8_t* dstParam[],
+                               int dstStride[])
 {
     uint8_t *dst = dstParam[1] + dstStride[1]*srcSliceY/2;
 
@@ -123,61 +126,73 @@  static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
               dstParam[0], dstStride[0]);
 
     if (c->dstFormat == PIX_FMT_NV12)
-        interleaveBytes(src[1], src[2], dst, c->srcW/2, srcSliceH/2, srcStride[1], srcStride[2], dstStride[0]);
+        interleaveBytes(src[1], src[2], dst, c->srcW/2, srcSliceH/2,
+                        srcStride[1], srcStride[2], dstStride[0]);
     else
-        interleaveBytes(src[2], src[1], dst, c->srcW/2, srcSliceH/2, srcStride[2], srcStride[1], dstStride[0]);
+        interleaveBytes(src[2], src[1], dst, c->srcW/2, srcSliceH/2,
+                        srcStride[2], srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int planarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int planarToYuy2Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, int srcSliceH,
+                               uint8_t* dstParam[], int dstStride[])
 {
     uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
 
-    yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]);
+    yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0],
+               srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int planarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int planarToUyvyWrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, int srcSliceH,
+                               uint8_t* dstParam[], int dstStride[])
 {
     uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
 
-    yv12touyvy(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]);
+    yv12touyvy(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0],
+               srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                                int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t* src[],
+                                int srcStride[], int srcSliceY, int srcSliceH,
+                                uint8_t* dstParam[], int dstStride[])
 {
     uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
 
-    yuv422ptoyuy2(src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0]);
+    yuv422ptoyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], 
+                  srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                                int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t* src[],
+                                int srcStride[], int srcSliceY, int srcSliceH,
+                                uint8_t* dstParam[], int dstStride[])
 {
     uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
 
-    yuv422ptouyvy(src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0]);
+    yuv422ptouyvy(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], 
+                  srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, int srcSliceH,
+                               uint8_t* dstParam[], int dstStride[])
 {
     uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
     uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY/2;
     uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY/2;
 
-    yuyvtoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
+    yuyvtoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
+                 dstStride[1], srcStride[0]);
 
     if (dstParam[3])
         fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255);
@@ -185,26 +200,30 @@  static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
     return srcSliceH;
 }
 
-static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, int srcSliceH,
+                               uint8_t* dstParam[], int dstStride[])
 {
     uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
     uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY;
     uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY;
 
-    yuyvtoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
+    yuyvtoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
+                 dstStride[1], srcStride[0]);
 
     return srcSliceH;
 }
 
-static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, int srcSliceH,
+                               uint8_t* dstParam[], int dstStride[])
 {
     uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
     uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY/2;
     uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY/2;
 
-    uyvytoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
+    uyvytoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
+                 dstStride[1], srcStride[0]);
 
     if (dstParam[3])
         fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255);
@@ -212,38 +231,43 @@  static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
     return srcSliceH;
 }
 
-static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, int srcSliceH,
+                               uint8_t* dstParam[], int dstStride[])
 {
     uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
     uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY;
     uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY;
 
-    uyvytoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
+    uyvytoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
+                 dstStride[1], srcStride[0]);
 
     return srcSliceH;
 }
 
-static void gray8aToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+static void gray8aToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels,
+                             const uint8_t *palette)
 {
     int i;
-    for (i=0; i<num_pixels; i++)
+    for (i = 0; i < num_pixels; i++)
         ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] | (src[(i<<1)+1] << 24);
 }
 
-static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, int num_pixels,
+                               const uint8_t *palette)
 {
     int i;
 
-    for (i=0; i<num_pixels; i++)
+    for (i = 0; i < num_pixels; i++)
         ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] | src[(i<<1)+1];
 }
 
-static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels,
+                             const uint8_t *palette)
 {
     int i;
 
-    for (i=0; i<num_pixels; i++) {
+    for (i = 0; i < num_pixels; i++) {
         //FIXME slow?
         dst[0]= palette[src[i<<1]*4+0];
         dst[1]= palette[src[i<<1]*4+1];
@@ -273,8 +297,9 @@  static int packed_16bpc_bswap(SwsContext *c, const uint8_t* src[],
     return srcSliceH;
 }
 
-static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                           int srcSliceH, uint8_t* dst[], int dstStride[])
+static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
+                           int srcSliceY, int srcSliceH, uint8_t* dst[],
+                           int dstStride[])
 {
     const enum PixelFormat srcFormat= c->srcFormat;
     const enum PixelFormat dstFormat= c->dstFormat;
@@ -308,7 +333,7 @@  static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
         av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
                sws_format_name(srcFormat), sws_format_name(dstFormat));
     else {
-        for (i=0; i<srcSliceH; i++) {
+        for (i = 0; i < srcSliceH; i++) {
             conv(srcPtr, dstPtr, c->srcW, (uint8_t *) c->pal_rgb);
             srcPtr+= srcStride[0];
             dstPtr+= dstStride[0];
@@ -326,8 +351,9 @@  static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
         )
 
 /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */
-static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                           int srcSliceH, uint8_t* dst[], int dstStride[])
+static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
+                           int srcSliceY, int srcSliceH, uint8_t* dst[],
+                           int dstStride[])
 {
     const enum PixelFormat srcFormat= c->srcFormat;
     const enum PixelFormat dstFormat= c->dstFormat;
@@ -370,7 +396,7 @@  static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
         case 0x84: conv= rgb16to32; break;
         case 0x86: conv= rgb24to32; break;
         }
-    } else if (  (isBGRinInt(srcFormat) && isRGBinInt(dstFormat))
+    } else if ( (isBGRinInt(srcFormat) && isRGBinInt(dstFormat))
              || (isRGBinInt(srcFormat) && isBGRinInt(dstFormat))) {
         switch(srcId | (dstId<<4)) {
         case 0x33: conv= rgb15tobgr15; break;
@@ -397,19 +423,23 @@  static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
     } else {
         const uint8_t *srcPtr= src[0];
               uint8_t *dstPtr= dst[0];
-        if ((srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1) && !isRGBA32(dstFormat))
+        if ((srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1)
+            && !isRGBA32(dstFormat))
             srcPtr += ALT32_CORR;
 
-        if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat == PIX_FMT_BGR32_1) && !isRGBA32(srcFormat))
+        if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat == PIX_FMT_BGR32_1)
+            && !isRGBA32(srcFormat))
             dstPtr += ALT32_CORR;
 
-        if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0 && !(srcStride[0] % srcBpp))
-            conv(srcPtr, dstPtr + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
+        if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0
+            && !(srcStride[0] % srcBpp))
+            conv(srcPtr, dstPtr + dstStride[0]*srcSliceY,
+                 srcSliceH*srcStride[0]);
         else {
             int i;
             dstPtr += dstStride[0]*srcSliceY;
 
-            for (i=0; i<srcSliceH; i++) {
+            for (i = 0; i < srcSliceH; i++) {
                 conv(srcPtr, dstPtr, c->srcW*srcBpp);
                 srcPtr+= srcStride[0];
                 dstPtr+= dstStride[0];
@@ -419,8 +449,9 @@  static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
     return srcSliceH;
 }
 
-static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                              int srcSliceH, uint8_t* dst[], int dstStride[])
+static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[],
+                              int srcStride[], int srcSliceY, int srcSliceH,
+                              uint8_t* dst[], int dstStride[])
 {
     rgb24toyv12(
         src[0],
@@ -434,8 +465,9 @@  static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride
     return srcSliceH;
 }
 
-static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                             int srcSliceH, uint8_t* dst[], int dstStride[])
+static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[],
+                             int srcStride[], int srcSliceY, int srcSliceH,
+                             uint8_t* dst[], int dstStride[])
 {
     copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW,
               dst[0], dstStride[0]);
@@ -450,10 +482,11 @@  static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[
 }
 
 /* unscaled copy like stuff (assumes nearly identical formats) */
-static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                             int srcSliceH, uint8_t* dst[], int dstStride[])
+static int packedCopyWrapper(SwsContext *c, const uint8_t* src[],
+                             int srcStride[], int srcSliceY, int srcSliceH,
+                             uint8_t* dst[], int dstStride[])
 {
-    if (dstStride[0]==srcStride[0] && srcStride[0] > 0)
+    if (dstStride[0] == srcStride[0] && srcStride[0] > 0)
         memcpy(dst[0] + dstStride[0]*srcSliceY, src[0], srcSliceH*dstStride[0]);
     else {
         int i;
@@ -466,7 +499,7 @@  static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
            && length+c->srcW <= FFABS(srcStride[0])) length+= c->srcW;
         assert(length!=0);
 
-        for (i=0; i<srcSliceH; i++) {
+        for (i = 0; i < srcSliceH; i++) {
             memcpy(dstPtr, srcPtr, length);
             srcPtr+= srcStride[0];
             dstPtr+= dstStride[0];
@@ -496,11 +529,12 @@  static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
         src += srcStride; \
     }
 
-static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                             int srcSliceH, uint8_t* dst[], int dstStride[])
+static int planarCopyWrapper(SwsContext *c, const uint8_t* src[],
+                             int srcStride[], int srcSliceY, int srcSliceH,
+                             uint8_t* dst[], int dstStride[])
 {
     int plane, i, j;
-    for (plane=0; plane<4; plane++) {
+    for (plane = 0; plane < 4; plane++) {
         int length= (plane==0 || plane==3) ? c->srcW  : -((-c->srcW  )>>c->chrDstHSubSample);
         int y=      (plane==0 || plane==3) ? srcSliceY: -((-srcSliceY)>>c->chrDstVSubSample);
         int height= (plane==0 || plane==3) ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample);
@@ -513,7 +547,8 @@  static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
         if (!src[plane] || (plane == 1 && !src[2])) {
             if(is16BPS(c->dstFormat))
                 length*=2;
-            fillPlane(dst[plane], dstStride[plane], length, height, y, (plane==3) ? 255 : 128);
+            fillPlane(dst[plane], dstStride[plane], length, height, y,
+                      (plane==3) ? 255 : 128);
         } else {
             if(is9_OR_10BPS(c->srcFormat)) {
                 const int src_depth = av_pix_fmt_descriptors[c->srcFormat].comp[plane].depth_minus1+1;
@@ -653,8 +688,8 @@  static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
                     COPY16TO8(AV_RL16);
                 }
             } else if(!is16BPS(c->srcFormat) && is16BPS(c->dstFormat)) {
-                for (i=0; i<height; i++) {
-                    for (j=0; j<length; j++) {
+                for (i = 0; i < height; i++) {
+                    for (j = 0; j < length; j++) {
                         dstPtr[ j<<1   ] = srcPtr[j];
                         dstPtr[(j<<1)+1] = srcPtr[j];
                     }
@@ -662,10 +697,10 @@  static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
                     dstPtr+= dstStride[plane];
                 }
             } else if(is16BPS(c->srcFormat) && is16BPS(c->dstFormat)
-                  && isBE(c->srcFormat) != isBE(c->dstFormat)) {
+                      && isBE(c->srcFormat) != isBE(c->dstFormat)) {
 
-                for (i=0; i<height; i++) {
-                    for (j=0; j<length; j++)
+                for (i = 0; i < height; i++) {
+                    for (j = 0; j < length; j++)
                         ((uint16_t*)dstPtr)[j] = av_bswap16(((const uint16_t*)srcPtr)[j]);
                     srcPtr+= srcStride[plane];
                     dstPtr+= dstStride[plane];
@@ -677,7 +712,7 @@  static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
             } else {
                 if(is16BPS(c->srcFormat) && is16BPS(c->dstFormat))
                     length*=2;
-                for (i=0; i<height; i++) {
+                for (i = 0; i < height; i++) {
                     memcpy(dstPtr, srcPtr, length);
                     srcPtr+= srcStride[plane];
                     dstPtr+= dstStride[plane];
@@ -707,21 +742,27 @@  void ff_get_unscaled_swscale(SwsContext *c)
         && (c->dstFormatBpp < c->srcFormatBpp || (!isAnyRGB(srcFormat)));
 
     /* yv12_to_nv12 */
-    if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) && (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21)) {
+    if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P)
+        && (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21)) {
         c->swScale= planarToNv12Wrapper;
     }
     /* yuv2bgr */
-    if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P || srcFormat==PIX_FMT_YUVA420P) && isAnyRGB(dstFormat)
+    if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUV422P
+         || srcFormat == PIX_FMT_YUVA420P) && isAnyRGB(dstFormat)
         && !(flags & SWS_ACCURATE_RND) && !(dstH&1)) {
         c->swScale= ff_yuv2rgb_get_func_ptr(c);
     }
 
-    if (srcFormat==PIX_FMT_YUV410P && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) {
+    if (srcFormat == PIX_FMT_YUV410P
+        && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)
+        && !(flags & SWS_BITEXACT)) {
         c->swScale= yvu9ToYv12Wrapper;
     }
 
     /* bgr24toYV12 */
-    if (srcFormat==PIX_FMT_BGR24 && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_ACCURATE_RND))
+    if (srcFormat == PIX_FMT_BGR24
+        && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)
+        && !(flags & SWS_ACCURATE_RND))
         c->swScale= bgr24ToYv12Wrapper;
 
     /* RGB/BGR -> RGB/BGR (no dither needed forms) */
@@ -765,7 +806,7 @@  void ff_get_unscaled_swscale(SwsContext *c)
 
     if (srcFormat == PIX_FMT_YUV422P) {
         if (dstFormat == PIX_FMT_YUYV422)
-            c->swScale= yuv422pToYuy2Wrapper;
+            c->swScale = yuv422pToYuy2Wrapper;
         else if (dstFormat == PIX_FMT_UYVY422)
             c->swScale= yuv422pToUyvyWrapper;
     }
@@ -775,14 +816,16 @@  void ff_get_unscaled_swscale(SwsContext *c)
         /* yv12_to_yuy2 */
         if (srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) {
             if (dstFormat == PIX_FMT_YUYV422)
-                c->swScale= planarToYuy2Wrapper;
+                c->swScale = planarToYuy2Wrapper;
             else if (dstFormat == PIX_FMT_UYVY422)
                 c->swScale= planarToUyvyWrapper;
         }
     }
-    if(srcFormat == PIX_FMT_YUYV422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
+    if(srcFormat == PIX_FMT_YUYV422
+       && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
         c->swScale= yuyvToYuv420Wrapper;
-    if(srcFormat == PIX_FMT_UYVY422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
+    if(srcFormat == PIX_FMT_UYVY422
+       && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
         c->swScale= uyvyToYuv420Wrapper;
     if(srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV422P)
         c->swScale= yuyvToYuv422Wrapper;
@@ -790,7 +833,7 @@  void ff_get_unscaled_swscale(SwsContext *c)
         c->swScale= uyvyToYuv422Wrapper;
 
     /* simple copy */
-    if (  srcFormat == dstFormat
+    if (    srcFormat == dstFormat
         || (srcFormat == PIX_FMT_YUVA420P && dstFormat == PIX_FMT_YUV420P)
         || (srcFormat == PIX_FMT_YUV420P && dstFormat == PIX_FMT_YUVA420P)
         || (isPlanarYUV(srcFormat) && isGray(dstFormat))
@@ -845,9 +888,11 @@  static int check_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt,
  * swscale wrapper, so we don't need to export the SwsContext.
  * Assumes planar YUV to be in YUV order instead of YVU.
  */
-int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[],
-              const int srcStride[], int srcSliceY, int srcSliceH,
-              uint8_t* const dst[], const int dstStride[])
+int attribute_align_arg sws_scale(struct SwsContext *c,
+                                  const uint8_t* const srcSlice[],
+                                  const int srcStride[], int srcSliceY,
+                                  int srcSliceH, uint8_t* const dst[],
+                                  const int dstStride[])
 {
     int i;
     const uint8_t* src2[4]= {srcSlice[0], srcSlice[1], srcSlice[2], srcSlice[3]};
@@ -875,7 +920,7 @@  int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
     }
 
     if (usePal(c->srcFormat)) {
-        for (i=0; i<256; i++) {
+        for (i = 0; i < 256; i++) {
             int p, r, g, b,y,u,v;
             if(c->srcFormat == PIX_FMT_PAL8) {
                 p=((const uint32_t*)(srcSlice[1]))[i];
@@ -894,7 +939,8 @@  int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
                 r= (i>>3    )*255;
                 g= ((i>>1)&3)*85;
                 b= (i&1     )*255;
-            } else if(c->srcFormat == PIX_FMT_GRAY8 || c->srcFormat == PIX_FMT_Y400A) {
+            } else if(c->srcFormat == PIX_FMT_GRAY8
+                      || c->srcFormat == PIX_FMT_Y400A) {
                 r = g = b = i;
             } else {
                 assert(c->srcFormat == PIX_FMT_BGR4_BYTE);
@@ -939,8 +985,10 @@  int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
     // copy strides, so they can safely be modified
     if (c->sliceDir == 1) {
         // slices go from top to bottom
-        int srcStride2[4]= {srcStride[0], srcStride[1], srcStride[2], srcStride[3]};
-        int dstStride2[4]= {dstStride[0], dstStride[1], dstStride[2], dstStride[3]};
+        int srcStride2[4]= {srcStride[0], srcStride[1], srcStride[2],
+                            srcStride[3]};
+        int dstStride2[4]= {dstStride[0], dstStride[1], dstStride[2],
+                            dstStride[3]};
 
         reset_ptr(src2, c->srcFormat);
         reset_ptr((const uint8_t**)dst2, c->dstFormat);
@@ -949,11 +997,14 @@  int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
         if (srcSliceY + srcSliceH == c->srcH)
             c->sliceDir = 0;
 
-        return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, dstStride2);
+        return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2,
+                          dstStride2);
     } else {
         // slices go from bottom to top => we flip the image internally
-        int srcStride2[4]= {-srcStride[0], -srcStride[1], -srcStride[2], -srcStride[3]};
-        int dstStride2[4]= {-dstStride[0], -dstStride[1], -dstStride[2], -dstStride[3]};
+        int srcStride2[4]= {-srcStride[0], -srcStride[1], -srcStride[2],
+                            -srcStride[3]};
+        int dstStride2[4]= {-dstStride[0], -dstStride[1], -dstStride[2],
+                            -dstStride[3]};
 
         src2[0] += (srcSliceH-1)*srcStride[0];
         if (!usePal(c->srcFormat))
@@ -972,25 +1023,28 @@  int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
         if (!srcSliceY)
             c->sliceDir = 0;
 
-        return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, srcSliceH, dst2, dstStride2);
+        return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH,
+                          srcSliceH, dst2, dstStride2);
     }
 }
 
 /* Convert the palette to the same packed 32-bit format as the palette */
-void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst,
+                                   int num_pixels, const uint8_t *palette)
 {
     int i;
 
-    for (i=0; i<num_pixels; i++)
+    for (i = 0; i < num_pixels; i++)
         ((uint32_t *) dst)[i] = ((const uint32_t *) palette)[src[i]];
 }
 
 /* Palette format: ABCD -> dst format: ABC */
-void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst,
+                                   int num_pixels, const uint8_t *palette)
 {
     int i;
 
-    for (i=0; i<num_pixels; i++) {
+    for (i = 0; i < num_pixels; i++) {
         //FIXME slow?
         dst[0]= palette[src[i]*4+0];
         dst[1]= palette[src[i]*4+1];
-- 
1.7.5.4