From ce8bc1320d1a8a5e1a5797a6f19ea3f7d6701617 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 6 Nov 2013 20:26:39 +0100
Subject: memcpy_pic: reformat

Besides cosmetic changes, also change memcpy_pic return type and remove
config.h include.
---
 video/memcpy_pic.h | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

(limited to 'video')

diff --git a/video/memcpy_pic.h b/video/memcpy_pic.h
index 5343739e82..01c874e151 100644
--- a/video/memcpy_pic.h
+++ b/video/memcpy_pic.h
@@ -19,7 +19,6 @@
 #ifndef MPLAYER_FASTMEMCPY_H
 #define MPLAYER_FASTMEMCPY_H
 
-#include "config.h"
 #include <inttypes.h>
 #include <string.h>
 #include <stddef.h>
@@ -27,34 +26,25 @@
 #define my_memcpy_pic memcpy_pic
 #define memcpy_pic2(d, s, b, h, ds, ss, unused) memcpy_pic(d, s, b, h, ds, ss)
 
-static inline void * memcpy_pic(void * dst, const void * src,
-                                int bytesPerLine, int height,
-                                int dstStride, int srcStride)
+static inline void memcpy_pic(void *dst, const void *src,
+                              int bytesPerLine, int height,
+                              int dstStride, int srcStride)
 {
-	int i;
-	void *retval=dst;
-
-	if(bytesPerLine == dstStride && dstStride == srcStride)
-	{
-		if (srcStride < 0) {
-	    		src = (uint8_t*)src + (height-1)*srcStride;
-	    		dst = (uint8_t*)dst + (height-1)*dstStride;
-	    		srcStride = -srcStride;
-		}
-
-		memcpy(dst, src, srcStride*height);
-	}
-	else
-	{
-		for(i=0; i<height; i++)
-		{
-			memcpy(dst, src, bytesPerLine);
-			src = (uint8_t*)src + srcStride;
-			dst = (uint8_t*)dst + dstStride;
-		}
-	}
+    if (bytesPerLine == dstStride && dstStride == srcStride) {
+        if (srcStride < 0) {
+            src = (uint8_t*)src + (height - 1) * srcStride;
+            dst = (uint8_t*)dst + (height - 1) * dstStride;
+            srcStride = -srcStride;
+        }
 
-	return retval;
+        memcpy(dst, src, srcStride * height);
+    } else {
+        for (int i = 0; i < height; i++) {
+            memcpy(dst, src, bytesPerLine);
+            src = (uint8_t*)src + srcStride;
+            dst = (uint8_t*)dst + dstStride;
+        }
+    }
 }
 
 static inline void memset_pic(void *dst, int fill, int bytesPerLine, int height,
-- 
cgit v1.2.3