summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authoruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-09 01:17:52 +0000
committeruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-09 01:17:52 +0000
commit77c0eb8af99c3f3106462c75c9263e843c3099a4 (patch)
treee4d1aa5ceba5ed6885e959e2163d4eaa03e316d1 /configure
parentb5aa5692cd45cc27abd7a4758bb475577ae28a78 (diff)
downloadmpv-77c0eb8af99c3f3106462c75c9263e843c3099a4.tar.bz2
mpv-77c0eb8af99c3f3106462c75c9263e843c3099a4.tar.xz
Set CONFIG_SWSCALER in order to avoid imgresample
Set "CONFIG_SWSCALE=yes" in config.mak. This prevents building libavcodec/imgresample.o which has symbols that conflict with swscale ones. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25655 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index c5b4279c6d..ed2db509f2 100755
--- a/configure
+++ b/configure
@@ -7766,6 +7766,8 @@ CONFIG_ZLIB=$_zlib
CONFIG_GPL=yes
CONFIG_ENCODERS=$_mencoder
CONFIG_MUXERS=$_mencoder
+# Prevent building libavcodec/imgresample.c with conflicting symbols
+CONFIG_SWSCALER=yes
RADIO=$_radio
RADIO_CAPTURE=$_radio_capture
VIDIX_CYBERBLADE=$_vidix_drv_cyberblade