summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-06 20:26:39 +0100
committerwm4 <wm4@nowhere>2013-11-06 20:27:13 +0100
commitce8bc1320d1a8a5e1a5797a6f19ea3f7d6701617 (patch)
tree781320c58857c4f493a6193dd3274e38be94e13b /video
parent6d2c5fc99a0e0150bb88588463e9272e5bc46d0d (diff)
downloadmpv-ce8bc1320d1a8a5e1a5797a6f19ea3f7d6701617.tar.bz2
mpv-ce8bc1320d1a8a5e1a5797a6f19ea3f7d6701617.tar.xz
memcpy_pic: reformat
Besides cosmetic changes, also change memcpy_pic return type and remove config.h include.
Diffstat (limited to 'video')
-rw-r--r--video/memcpy_pic.h44
1 files changed, 17 insertions, 27 deletions
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,