diff -ur xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h
--- xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h	2005-04-19 07:17:50.000000000 +0200
+++ xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h	2005-08-07 12:01:13.000000000 +0200
@@ -94,7 +94,7 @@
 	"add	$16, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -141,7 +141,7 @@
 	"add	$32, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -211,7 +211,7 @@
 	"add	$32, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -266,7 +266,7 @@
 	"add	$16, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -318,7 +318,7 @@
 	"add	$32, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -406,7 +406,7 @@
 	"add	$32, %2			\n\t"
 	"subl	$2, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -460,7 +460,7 @@
 	"add	$32, %2			\n\t"
 	"subl	$2, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -533,7 +533,7 @@
 	"add	$32, %2			\n\t"
 	"subl	$2, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
diff -ur xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx.c xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
--- xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx.c	2005-07-19 22:31:09.000000000 +0200
+++ xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx.c	2005-08-07 11:59:46.000000000 +0200
@@ -62,7 +62,7 @@
     "pcmpeqd %%" #regd ", %%" #regd " \n\t"\
     "paddb %%" #regd ", %%" #regd " \n\t" ::)
 
-#ifndef PIC
+#ifndef __PIC__
 #define MOVQ_BONE(regd)  __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_bone))
 #define MOVQ_WTWO(regd)  __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo))
 #else
Only in xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386: dsputil_mmx.c.orig
diff -ur xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h
--- xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h	2005-04-19 07:17:50.000000000 +0200
+++ xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h	2005-08-07 11:59:46.000000000 +0200
@@ -96,7 +96,7 @@
 	"add	%5, %3			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
         :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
         :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -191,7 +191,7 @@
 	"add	$32, %2			\n\t"
 	"subl	$2, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
Only in xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386: dsputil_mmx_rnd.h.orig
diff -ur xine-lib-1.1.0/src/libffmpeg/libavcodec/msmpeg4.c xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/msmpeg4.c
--- xine-lib-1.1.0/src/libffmpeg/libavcodec/msmpeg4.c	2005-05-15 01:34:59.000000000 +0200
+++ xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/msmpeg4.c	2005-08-07 12:00:49.000000000 +0200
@@ -849,7 +849,7 @@
        necessitate to modify mpegvideo.c. The problem comes from the
        fact they decided to store the quantized DC (which would lead
        to problems if Q could vary !) */
-#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined PIC
+#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined __PIC__
     asm volatile(
         "movl %3, %%eax		\n\t"
 	"shrl $1, %%eax		\n\t"
diff -ur xine-lib-1.1.0/src/xine-utils/cpu_accel.c xine-lib-1.1.0-pic/src/xine-utils/cpu_accel.c
--- xine-lib-1.1.0/src/xine-utils/cpu_accel.c	2004-07-05 10:33:53.000000000 +0200
+++ xine-lib-1.1.0-pic/src/xine-utils/cpu_accel.c	2005-08-07 11:59:46.000000000 +0200
@@ -63,7 +63,7 @@
   int AMD;
 
   caps = 0;
-#ifndef PIC
+#ifndef __PIC__
 #define cpuid(op,eax,ebx,ecx,edx)       \
     __asm__ ("cpuid"                    \
          : "=a" (eax),                  \