]>
Commit | Line | Data |
---|---|---|
f9cd8cfe RT |
1 | --- mlt-0.2.2/src/modules/avformat/consumer_avformat.c.bak 2005-11-10 13:26:32.000000000 +0100 |
2 | +++ mlt-0.2.2/src/modules/avformat/consumer_avformat.c 2006-12-17 17:20:28.252460177 +0100 | |
3 | @@ -926,7 +926,7 @@ | |
4 | n = ( width + 7 ) / 8; | |
5 | p = output->data[ 0 ] + i * output->linesize[ 0 ]; | |
6 | ||
7 | - #ifndef __DARWIN__ | |
8 | + #ifndef __powerpc__ | |
9 | p += 3; | |
10 | #endif | |
11 | ||
12 | --- mlt-0.2.2/src/modules/motion_est/filter_motion_est.c.bak 2005-10-28 08:59:28.000000000 +0200 | |
13 | +++ mlt-0.2.2/src/modules/motion_est/filter_motion_est.c 2006-12-17 17:21:35.389036545 +0100 | |
14 | @@ -34,7 +34,7 @@ | |
15 | #include <sys/time.h> | |
16 | #include <unistd.h> | |
17 | ||
18 | -#ifndef __DARWIN__ | |
19 | +#ifdef HAVE_SSE | |
20 | #include "sad_sse.h" | |
21 | #endif | |
22 | ||
23 | @@ -612,7 +612,7 @@ | |
24 | } /* End column loop */ | |
25 | } /* End row loop */ | |
26 | ||
27 | -#ifndef __DARWIN__ | |
28 | +#ifdef HAVE_SSE | |
29 | asm volatile ( "emms" ); | |
30 | #endif | |
31 | ||
32 | @@ -656,7 +656,7 @@ | |
33 | static void init_optimizations( struct motion_est_context_s *c ) | |
34 | { | |
35 | switch(c->mb_w){ | |
36 | -#ifndef __DARWIN__ | |
37 | +#ifdef HAVE_SSE | |
38 | case 4: if(c->mb_h == 4) c->compare_optimized = sad_sse_422_luma_4x4; | |
39 | else c->compare_optimized = sad_sse_422_luma_4w; | |
40 | break; | |
41 | --- mlt-0.2.2/configure.bak 2006-12-06 17:59:19.115902271 +0100 | |
42 | +++ mlt-0.2.2/configure 2006-12-17 17:24:50.666713281 +0100 | |
43 | @@ -74,6 +74,13 @@ | |
44 | *) | |
45 | ;; | |
46 | esac | |
47 | + case $targetarch in | |
48 | + i386|x86_64) | |
49 | + echo "CFLAGS+=-DHAVE_SSE" | |
50 | + ;; | |
51 | + *) | |
52 | + ;; | |
53 | + esac | |
54 | echo "LIBSUF=$LIBSUF" | |
55 | ) > config.mak | |
56 | ||
57 | @@ -135,6 +142,11 @@ | |
58 | LIBSUF=".so" | |
59 | ;; | |
60 | esac | |
61 | +# Determine ARCH | |
62 | +targetarch=$(uname -m) | |
63 | +if expr $targetarch : 'i[3-9]86' >/dev/null; then | |
64 | + targetarch=i386 | |
65 | +fi | |
66 | export LIBSUF | |
67 | ||
68 | # Iterate through arguments |