Mercurial > mplayer.hg

diff configure @ 25627:b4a3a1e44ab4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author uau
date Wed, 09 Jan 2008 01:17:52 +0000
parents 9f8df9433c25
children be5262a6034f
line wrap: on
line diff
--- a/configure	Wed Jan 09 01:17:49 2008 +0000
+++ b/configure	Wed Jan 09 01:17:52 2008 +0000
@@ -7766,6 +7766,8 @@
 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