From 93574faeeef013bf27081dccce4710407d92bfb0 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 15 Dec 2008 22:25:39 +0000 Subject: xvmc is now a CONFIG_ option in FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28154 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index df1e56a701..652694ffae 100755 --- a/configure +++ b/configure @@ -4114,12 +4114,12 @@ EOF done fi if test "$_xvmc" = yes ; then - _def_xvmc='#define HAVE_XVMC 1' + _def_xvmc='#define CONFIG_XVMC 1' _libs_mplayer="$_libs_mplayer -lXvMC -l$_xvmclib" _vomodules="xvmc $_vomodules" _res_comment="using $_xvmclib" else - _def_xvmc='#undef HAVE_XVMC' + _def_xvmc='#undef CONFIG_XVMC' _novomodules="xvmc $_novomodules" _libavdecoders=`echo $_libavdecoders | sed -e s/MPEG_XVMC_DECODER// ` fi @@ -7975,7 +7975,6 @@ GUI_GTK = $_gui_gtk GUI_WIN32 = $_gui_win32 HAVE_POSIX_SELECT = $_posix_select HAVE_SYS_MMAN_H = $_mman -HAVE_XVMC = $_xvmc IVTV = $_ivtv JACK = $_jack JOYSTICK = $_joystick @@ -8130,6 +8129,7 @@ CONFIG_MUXERS=$_mencoder CONFIG_POSTPROC = yes # Prevent building libavcodec/imgresample.c with conflicting symbols CONFIG_SWSCALE=yes +CONFIG_XVMC=$_xvmc CONFIG_ZLIB=$_zlib HAVE_PTHREADS = $_pthreads -- cgit v1.2.3