aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-04 14:23:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-04 14:23:22 +0100
commitdacd6202ec50d122fcb7e9e92cdd014444cd2a98 (patch)
tree0c9ceb86ced0b85eb1b1eccfc7346060b69a2b37 /configure
parent765debf51f1aee58b6748e575082ecd30033b323 (diff)
parent1944d532a8a1c4b12222f0acfeb1153630dbc996 (diff)
downloadffmpeg-dacd6202ec50d122fcb7e9e92cdd014444cd2a98.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: ppc: always use pic for shared libraries build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place fate: ea, h264: prettyprinting and ordering cosmetics Conflicts: tests/fate/ea.mak tests/fate/h264.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 6dda93d58f..3083b01a1d 100755
--- a/configure
+++ b/configure
@@ -3034,6 +3034,7 @@ case "$arch" in
;;
ppc)
check_64bit ppc ppc64 'sizeof(void *) > 4'
+ spic=$shared
;;
sparc)
check_64bit sparc sparc64 'sizeof(void *) > 4'