Cosmetics:

- Place curly brackets in the same line as while/for/if/switch/else/do;
- Place curly brackets at column 0 in the next line starting a function.

Originally committed as revision 29523 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

2 files changed, 23 insertions, 16 deletions

diff --git a/libswscale/x86/yuv2rgb_mmx.c b/libswscale/x86/yuv2rgb_mmx.c
index e0b76e0b2d..b03cce2ae7 100644
--- a/libswscale/x86/yuv2rgb_mmx.c
+++ b/libswscale/x86/yuv2rgb_mmx.c
@@ -63,15 +63,15 @@ SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c)
     if (c->flags & SWS_CPU_CAPS_MMX2) {
         switch (c->dstFormat) {
         case PIX_FMT_RGB32:
-            if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){
+            if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) {
                 if (HAVE_7REGS) return yuva420_rgb32_MMX2;
                 break;
-            }else return yuv420_rgb32_MMX2;
+            } else return yuv420_rgb32_MMX2;
         case PIX_FMT_BGR32:
-            if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){
+            if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) {
                 if (HAVE_7REGS) return yuva420_bgr32_MMX2;
                 break;
-            }else return yuv420_bgr32_MMX2;
+            } else return yuv420_bgr32_MMX2;
         case PIX_FMT_BGR24:  return yuv420_rgb24_MMX2;
         case PIX_FMT_RGB565: return yuv420_rgb16_MMX2;
         case PIX_FMT_RGB555: return yuv420_rgb15_MMX2;
@@ -80,15 +80,15 @@ SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c)
     if (c->flags & SWS_CPU_CAPS_MMX) {
         switch (c->dstFormat) {
         case PIX_FMT_RGB32:
-            if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){
+            if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) {
                 if (HAVE_7REGS) return yuva420_rgb32_MMX;
                 break;
-            }else return yuv420_rgb32_MMX;
+            } else return yuv420_rgb32_MMX;
         case PIX_FMT_BGR32:
-            if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){
+            if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) {
                 if (HAVE_7REGS) return yuva420_bgr32_MMX;
                 break;
-            }else return yuv420_bgr32_MMX;
+            } else return yuv420_bgr32_MMX;
         case PIX_FMT_BGR24:  return yuv420_rgb24_MMX;
         case PIX_FMT_RGB565: return yuv420_rgb16_MMX;
         case PIX_FMT_RGB555: return yuv420_rgb15_MMX;
diff --git a/libswscale/x86/yuv2rgb_template.c b/libswscale/x86/yuv2rgb_template.c
index 5f319699bd..e4a1a9809b 100644
--- a/libswscale/x86/yuv2rgb_template.c
+++ b/libswscale/x86/yuv2rgb_template.c
@@ -122,7 +122,7 @@
 
 
 #define YUV422_UNSHIFT                   \
-    if(c->srcFormat == PIX_FMT_YUV422P){ \
+    if(c->srcFormat == PIX_FMT_YUV422P) {\
         srcStride[1] *= 2;               \
         srcStride[2] *= 2;               \
     }                                    \
@@ -180,7 +180,8 @@
     return srcSliceH; \
 
 static inline int RENAME(yuv420_rgb16)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-                                       int srcSliceH, uint8_t* dst[], int dstStride[]){
+                                       int srcSliceH, uint8_t* dst[], int dstStride[])
+{
     int y, h_size;
 
     YUV422_UNSHIFT
@@ -236,7 +237,8 @@ static inline int RENAME(yuv420_rgb16)(SwsContext *c, uint8_t* src[], int srcStr
 }
 
 static inline int RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-                                       int srcSliceH, uint8_t* dst[], int dstStride[]){
+                                       int srcSliceH, uint8_t* dst[], int dstStride[])
+{
     int y, h_size;
 
     YUV422_UNSHIFT
@@ -294,7 +296,8 @@ static inline int RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* src[], int srcStr
 }
 
 static inline int RENAME(yuv420_rgb24)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-                                       int srcSliceH, uint8_t* dst[], int dstStride[]){
+                                       int srcSliceH, uint8_t* dst[], int dstStride[])
+{
     int y, h_size;
 
     YUV422_UNSHIFT
@@ -470,7 +473,8 @@ etc.
     "movq 8 (%5, %0, 2), %%mm6;" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */ \
 
 static inline int RENAME(yuv420_rgb32)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-                                       int srcSliceH, uint8_t* dst[], int dstStride[]){
+                                       int srcSliceH, uint8_t* dst[], int dstStride[])
+{
     int y, h_size;
 
     YUV422_UNSHIFT
@@ -486,7 +490,8 @@ static inline int RENAME(yuv420_rgb32)(SwsContext *c, uint8_t* src[], int srcStr
 }
 
 static inline int RENAME(yuva420_rgb32)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-                                        int srcSliceH, uint8_t* dst[], int dstStride[]){
+                                        int srcSliceH, uint8_t* dst[], int dstStride[])
+{
 #if HAVE_7REGS
     int y, h_size;
 
@@ -504,7 +509,8 @@ static inline int RENAME(yuva420_rgb32)(SwsContext *c, uint8_t* src[], int srcSt
 }
 
 static inline int RENAME(yuv420_bgr32)(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                                       int srcSliceH, uint8_t* dst[], int dstStride[]){
+                                       int srcSliceH, uint8_t* dst[], int dstStride[])
+{
     int y, h_size;
 
     YUV422_UNSHIFT
@@ -520,7 +526,8 @@ static inline int RENAME(yuv420_bgr32)(SwsContext *c, const uint8_t* src[], int
 }
 
 static inline int RENAME(yuva420_bgr32)(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                                        int srcSliceH, uint8_t* dst[], int dstStride[]){
+                                        int srcSliceH, uint8_t* dst[], int dstStride[])
+{
 #if HAVE_7REGS
     int y, h_size;