summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-07-05 22:11:34 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-07-05 22:11:34 +0000
commitd578ea7c2510b43105f1da99fcf4303009f5e425 (patch)
treea1ed233c0b09e880fcb2e3c934b5b52f309ff60e /src
parent625d899a54f59d95b231d3df8ebd4f1662501756 (diff)
downloadxine-lib-d578ea7c2510b43105f1da99fcf4303009f5e425.tar.gz
xine-lib-d578ea7c2510b43105f1da99fcf4303009f5e425.tar.bz2
Add definition of PIC in presence of __PIC__ or __pic__, to fix building of FFmpeg code on PIE-enabled systems. The change is already committed in FFmpeg's SVN.
CVS patchset: 8090 CVS date: 2006/07/05 22:11:34
Diffstat (limited to 'src')
-rw-r--r--src/libffmpeg/libavcodec/libpostproc/postprocess_internal.h4
-rw-r--r--src/libffmpeg/libavutil/common.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/libpostproc/postprocess_internal.h b/src/libffmpeg/libavcodec/libpostproc/postprocess_internal.h
index bab4c841c..3d19c694b 100644
--- a/src/libffmpeg/libavcodec/libpostproc/postprocess_internal.h
+++ b/src/libffmpeg/libavcodec/libpostproc/postprocess_internal.h
@@ -58,6 +58,10 @@
#define TEMP_NOISE_FILTER 0x100000
#define FORCE_QUANT 0x200000
+#if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC)
+# define PIC
+#endif
+
//use if u want a faster postprocessing code
//cant differentiate between chroma & luma filters (both on or both off)
//obviosly the -pp option at the commandline has no effect except turning the here selected
diff --git a/src/libffmpeg/libavutil/common.h b/src/libffmpeg/libavutil/common.h
index a0ef2faee..fffd2ff01 100644
--- a/src/libffmpeg/libavutil/common.h
+++ b/src/libffmpeg/libavutil/common.h
@@ -20,6 +20,10 @@
#define M_PI 3.14159265358979323846
#endif
+#if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC)
+# define PIC
+#endif
+
#ifdef HAVE_AV_CONFIG_H
/* only include the following when compiling package */
# include "config.h"