summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2001-11-07 14:50:44 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2001-11-07 14:50:44 +0000
commit914f83febd42f9610d9027d7bf8b659d58ea3441 (patch)
tree3e9aed83254535accb3a16207512e7a8f1bcee2b /src
parentb7e021c4c39907f3e7ae5b1ce4647354975fe5ed (diff)
downloadxine-lib-914f83febd42f9610d9027d7bf8b659d58ea3441.tar.gz
xine-lib-914f83febd42f9610d9027d7bf8b659d58ea3441.tar.bz2
make sure a valid memcopy for the machine is used even if .xinerc tells something different
CVS patchset: 984 CVS date: 2001/11/07 14:50:44
Diffstat (limited to 'src')
-rw-r--r--src/xine-utils/memcpy.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index f89e04eee..5ded24ebc 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -392,11 +392,11 @@ static unsigned long long int rdtsc()
#define BUFSIZE 1024*1024
void probe_fast_memcpy(config_values_t *config)
{
-unsigned long long t;
-char *buf1, *buf2;
-int i, j, best;
-static int config_flags = -1;
-
+ unsigned long long t;
+ char *buf1, *buf2;
+ int i, j, best;
+ static int config_flags = -1;
+
#ifdef ARCH_X86
config_flags = mm_accel();
#else
@@ -412,6 +412,8 @@ static int config_flags = -1;
fast_memcpy = memcpy_method[best].function;
return;
}
+
+ best = -1;
fast_memcpy = memcpy;
@@ -453,3 +455,4 @@ static int config_flags = -1;
free(buf1);
free(buf2);
}
+