aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2009-11-26 01:12:50 (GMT)
committerDevin Heitmueller <dheitmueller@kernellabs.com>2009-11-26 01:12:50 (GMT)
commitdc3ee06b2b262be30364e0ab36c5b99fdd884ec1 (patch)
tree092fc59c145dba8ef3d70089f022fc7a68cc6acf
parent4133bdeb91db3f2d5c33abd00c504924c5b22264 (diff)
djh - Fix compilation issue using patch from the Fedora repo:
http://cvs.fedoraproject.org/viewvc/rpms/tvtime/devel/tvtime-1.0.1-gcc4.1.patch?view=log fix build problem with gcc4.1
-rw-r--r--plugins/greedyh.asm2
-rw-r--r--plugins/tomsmocomp.cpp6
-rw-r--r--plugins/tomsmocomp/TomsMoCompAll2.inc4
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/greedyh.asm b/plugins/greedyh.asm
index 9cfcf76..555fc0f 100644
--- a/plugins/greedyh.asm
+++ b/plugins/greedyh.asm
@@ -18,7 +18,7 @@
#include "x86-64_macros.inc"
-void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
+void FUNCT_NAME(TDeinterlaceInfo* pInfo)
{
int64_t i;
bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
diff --git a/plugins/tomsmocomp.cpp b/plugins/tomsmocomp.cpp
index 971d9b5..3ace7ab 100644
--- a/plugins/tomsmocomp.cpp
+++ b/plugins/tomsmocomp.cpp
@@ -31,7 +31,7 @@ public:
#define IS_MMX
#define SSE_TYPE MMX
-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
+#define FUNCT_NAME filterDScaler_MMX
#include "tomsmocomp/TomsMoCompAll.inc"
#undef IS_MMX
#undef SSE_TYPE
@@ -39,7 +39,7 @@ public:
#define IS_3DNOW
#define SSE_TYPE 3DNOW
-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
+#define FUNCT_NAME filterDScaler_3DNOW
#include "tomsmocomp/TomsMoCompAll.inc"
#undef IS_3DNOW
#undef SSE_TYPE
@@ -47,7 +47,7 @@ public:
#define IS_SSE
#define SSE_TYPE SSE
-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
+#define FUNCT_NAME filterDScaler_SSE
#include "tomsmocomp/TomsMoCompAll.inc"
#undef IS_SSE
#undef SSE_TYPE
diff --git a/plugins/tomsmocomp/TomsMoCompAll2.inc b/plugins/tomsmocomp/TomsMoCompAll2.inc
index b79623e..baf1a1a 100644
--- a/plugins/tomsmocomp/TomsMoCompAll2.inc
+++ b/plugins/tomsmocomp/TomsMoCompAll2.inc
@@ -5,9 +5,9 @@
#endif
#ifdef USE_STRANGE_BOB
-#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
#else
-#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
#endif
int SEARCH_EFFORT_FUNC(0) // we don't try at all ;-)

Privacy Policy