diff options
| author | kinddragon <kinddragon@users.sourceforge.net> | 2010-04-20 04:46:15 +0400 |
|---|---|---|
| committer | kinddragon <kinddragon@users.sourceforge.net> | 2010-04-20 04:46:15 +0400 |
| commit | 3c584d0200f48d4b29f783bec509a756f3579ff3 (patch) | |
| tree | b916e3264c7c1772bc4641c5ab985c92fd166816 /src/DSUtil | |
| parent | d9b98dcdc206d836ecc6443e1331cb8691e9d6d7 (diff) | |
Functions declaration fixed (previous commit)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1801 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/DSUtil')
| -rw-r--r-- | src/DSUtil/vd_asm.cpp | 18 | ||||
| -rw-r--r-- | src/DSUtil/vd_asm.h | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/DSUtil/vd_asm.cpp b/src/DSUtil/vd_asm.cpp index 8933f3878..851449089 100644 --- a/src/DSUtil/vd_asm.cpp +++ b/src/DSUtil/vd_asm.cpp @@ -27,7 +27,7 @@ #pragma warning(disable : 4799) // no emms... blahblahblah
#ifndef _WIN64
-static void __declspec(naked) yuvtoyuy2row_MMX(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width)
+void __declspec(naked) yuvtoyuy2row_MMX(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width)
{
__asm {
push ebp
@@ -72,7 +72,7 @@ yuvtoyuy2row_loop: };
}
-static void __declspec(naked) yuvtoyuy2row_avg_MMX(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width, DWORD pitchuv)
+void __declspec(naked) yuvtoyuy2row_avg_MMX(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width, DWORD pitchuv)
{
static const __int64 mask = 0x7f7f7f7f7f7f7f7fi64;
@@ -135,7 +135,7 @@ yuvtoyuy2row_avg_loop: };
}
-static void __declspec(naked) yv12_yuy2_row_sse2() {
+void __declspec(naked) yv12_yuy2_row_sse2() {
__asm {
// ebx - Y
// edx - U
@@ -176,7 +176,7 @@ one: };
}
-static void __declspec(naked) yv12_yuy2_row_sse2_linear() {
+void __declspec(naked) yv12_yuy2_row_sse2_linear() {
__asm {
// ebx - Y
// edx - U
@@ -222,7 +222,7 @@ one: };
}
-static void __declspec(naked) yv12_yuy2_row_sse2_linear_interlaced() {
+void __declspec(naked) yv12_yuy2_row_sse2_linear_interlaced() {
__asm {
// ebx - Y
// edx - U
@@ -429,7 +429,7 @@ last4: };
}
-static void __declspec(naked) asm_blend_row_clipped_MMX(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)
+void __declspec(naked) asm_blend_row_clipped_MMX(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)
{
static const __int64 _x0001000100010001 = 0x0001000100010001;
@@ -484,7 +484,7 @@ xloop: };
}
-static void __declspec(naked) asm_blend_row_MMX(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)
+void __declspec(naked) asm_blend_row_MMX(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)
{
static const __int64 mask0 = 0xfcfcfcfcfcfcfcfci64;
static const __int64 mask1 = 0x7f7f7f7f7f7f7f7fi64;
@@ -613,7 +613,7 @@ nooddpart: __declspec(align(16)) static BYTE const_1_16_bytes[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-static void asm_blend_row_SSE2(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)
+void asm_blend_row_SSE2(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)
{
__asm
{
@@ -669,7 +669,7 @@ asm_blend_row_SSE2_end: }
}
-static void asm_blend_row_clipped_SSE2(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)
+void asm_blend_row_clipped_SSE2(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)
{
__asm
{
diff --git a/src/DSUtil/vd_asm.h b/src/DSUtil/vd_asm.h index da289a110..c1c78f39b 100644 --- a/src/DSUtil/vd_asm.h +++ b/src/DSUtil/vd_asm.h @@ -22,6 +22,7 @@ #pragma once
+#ifndef _WIN64
void yuvtoyuy2row_MMX(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width);
void yuvtoyuy2row_avg_MMX(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width, DWORD pitchuv);
@@ -35,3 +36,4 @@ void asm_blend_row_clipped_MMX(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch); void asm_blend_row_MMX(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch);
void asm_blend_row_SSE2(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch);
void asm_blend_row_clipped_SSE2(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch);
+#endif
|