| blob | a73ca9950e4b22c6f6ca8379a93e00e865eb1000 |
1 --- mythtv-0.18.1/libs/libavcodec/msmpeg4.c.old 2005-06-03 21:31:43.000000000 +0100
2 +++ mythtv-0.18.1/libs/libavcodec/msmpeg4.c 2005-06-03 21:31:51.000000000 +0100
3 @@ -723,7 +723,7 @@
4 necessitate to modify mpegvideo.c. The problem comes from the
5 fact they decided to store the quantized DC (which would lead
6 to problems if Q could vary !) */
7 -#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined PIC
8 +#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined __PIC__
9 asm volatile(
10 "movl %3, %%eax \n\t"
11 "shrl $1, %%eax \n\t"
12 --- mythtv-0.18.1/libs/libavcodec/i386/dsputil_mmx_avg.h.old 2005-06-03 21:38:57.000000000 +0100
13 +++ mythtv-0.18.1/libs/libavcodec/i386/dsputil_mmx_avg.h 2005-06-03 21:39:02.000000000 +0100
14 @@ -90,7 +90,7 @@
15 "add $16, %2 \n\t"
16 "subl $4, %0 \n\t"
17 "jnz 1b \n\t"
18 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
19 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
20 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
21 #else
22 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
23 @@ -137,7 +137,7 @@
24 "add $32, %2 \n\t"
25 "subl $4, %0 \n\t"
26 "jnz 1b \n\t"
27 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
28 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
29 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
30 #else
31 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
32 @@ -207,7 +207,7 @@
33 "add $32, %2 \n\t"
34 "subl $4, %0 \n\t"
35 "jnz 1b \n\t"
36 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
37 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
38 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
39 #else
40 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
41 @@ -262,7 +262,7 @@
42 "add $16, %2 \n\t"
43 "subl $4, %0 \n\t"
44 "jnz 1b \n\t"
45 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
46 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
47 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
48 #else
49 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
50 @@ -314,7 +314,7 @@
51 "add $32, %2 \n\t"
52 "subl $4, %0 \n\t"
53 "jnz 1b \n\t"
54 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
55 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
56 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
57 #else
58 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
59 @@ -402,7 +402,7 @@
60 "add $32, %2 \n\t"
61 "subl $2, %0 \n\t"
62 "jnz 1b \n\t"
63 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
64 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
65 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
66 #else
67 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
68 @@ -456,7 +456,7 @@
69 "add $32, %2 \n\t"
70 "subl $2, %0 \n\t"
71 "jnz 1b \n\t"
72 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
73 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
74 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
75 #else
76 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
77 @@ -529,7 +529,7 @@
78 "add $32, %2 \n\t"
79 "subl $2, %0 \n\t"
80 "jnz 1b \n\t"
81 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
82 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
83 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
84 #else
85 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)