diff options
author | wm4 <wm4@nowhere> | 2012-07-29 14:36:43 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-07-30 01:36:35 +0200 |
commit | a4bab723b30fe6190fb137b67bba521e55276cf6 (patch) | |
tree | 832355704fcde85307fc60b16bf171844560d669 | |
parent | 273a6623e7b97bb133486707a656f00209820b43 (diff) | |
download | mpv-a4bab723b30fe6190fb137b67bba521e55276cf6.tar.bz2 mpv-a4bab723b30fe6190fb137b67bba521e55276cf6.tar.xz |
fastmemcpy.h: remove code duplication
Remove the mem2agpcpy_pic function, which is obviously duplicated from
the other function in this file.
Untested, as this is only used by the directx and directfb2 VOs.
-rw-r--r-- | libvo/fastmemcpy.h | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index bc83abb5d5..621ae874dd 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -27,37 +27,11 @@ // meaningless ancient alias #define fast_memcpy memcpy -static inline void * mem2agpcpy_pic(void * dst, const void * src, int bytesPerLine, int height, int dstStride, int srcStride) -{ - int i; - void *retval=dst; - - if(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; - } - } - - return retval; -} - #define memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 0) #define my_memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 1) +#define mem2agpcpy_pic memcpy_pic + /** * \param limit2width always skip data between end of line and start of next * instead of copying the full block when strides are the same |