Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1037
diff -u -r1.1037 configure
--- configure	11 Aug 2005 13:16:34 -0000	1.1037
+++ configure	12 Aug 2005 15:12:12 -0000
@@ -208,7 +208,7 @@
   --disable-xanim        disable XAnim DLL support [autodetect]
   --disable-real         disable RealPlayer DLL support [autodetect]
   --disable-xvid         disable XviD codec [autodetect]
-  --disable-x264         disable H.264 encoder [autodetect]
+  --disable-x264         disable H.264 encoder [enabled]
   --disable-divx4linux   disable DivX4linux/Divx5linux codec [autodetect]
   --enable-opendivx      enable _old_ OpenDivx codec [disable]
   --disable-libavcodec   disable libavcodec [autodetect]
@@ -350,8 +350,6 @@
   --with-reallibdir=DIR    RealPlayer DLL files in DIR
   --with-xvidlibdir=DIR    libxvidcore (XviD) in DIR  (*)
   --with-xvidincdir=DIR    XviD header in DIR (*)
-  --with-x264libdir=DIR    libx264 in DIR
-  --with-x264incdir=DIR    x264 header in DIR
   --with-dtslibdir=DIR     libdts library in DIR  (*)
   --with-dtsincdir=DIR     libdts header in DIR (*)
   --with-livelibdir=DIR    LIVE.COM Streaming Media libraries in DIR
@@ -1434,7 +1432,7 @@
 _vidix=auto
 _joystick=no
 _xvid=auto
-_x264=auto
+_x264=yes
 _divx4linux=auto
 _opendivx=no
 _lirc=auto
@@ -1896,12 +1894,6 @@
   --with-dtsincdir=*)
     _inc_libdts=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
     ;;
-  --with-x264libdir=*)
-    _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-    ;;
-  --with-x264incdir=*)
-    _inc_x264=-I`echo $ac_option | cut -d '=' -f 2 |sed 's,:, -I,g'`
-    ;;
   --with-sdl-config=*)
     _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
     ;;
@@ -6158,22 +6150,15 @@
 fi
 
 echocheck "x264"
-cat > $TMPC << EOF
-#include <inttypes.h>
-#include <x264.h>
-#if X264_BUILD < 29
-#error We do not support old versions of x264. Get the latest from SVN.
-#endif
-int main(void) { x264_encoder_open((void*)0); return 0; }
-EOF
-_ld_x264="$_ld_x264 -lx264 $_ld_lm $_ld_pthread"
-if test "$_x264" != no && \
-( cc_check $_inc_x264 $_ld_x264 || \
-( test "$_x11" = yes && cc_check $_inc_x264 $_inc_x11 $_ld_x264 $_ld_x11 )) ; \
-then
-  _x264=yes
+if test "$_x264" == yes && test "$_pthreads" == yes ; then
+  _inc_x264="-I../x264"
   _def_x264='#define HAVE_X264 1'
   _codecmodules="x264 $_codecmodules"
+  if test "$_x11" = yes ; then
+      _x264_visualize=yes
+  else
+      _x264_visualize=no
+  fi
 else
   _x264=no
   _ld_x264=''
@@ -7047,7 +7032,6 @@
 XVID_LIB = $_ld_xvid
 X264 = $_x264
 X264_INC = $_inc_x264
-X264_LIB = $_ld_x264
 CONFIG_DTS = $_libdts
 DTS_INC = $_inc_libdts
 DTS_LIB = $_ld_libdts
@@ -7791,6 +7775,14 @@
 
 #############################################################################
 
+echo "Creating x264/config.mak"
+cat > x264/config.mak << EOF
+include ../config.mak
+VIS=$_x264_visualize
+EOF
+
+#############################################################################
+
 cat << EOF
 
 Config files successfully generated by ./configure !
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.328
diff -u -r1.328 Makefile
--- Makefile	11 Aug 2005 22:30:05 -0000	1.328
+++ Makefile	12 Aug 2005 15:50:06 -0000
@@ -175,6 +175,9 @@
 ifeq ($(LIBMPEG2),yes)
 PARTS += libmpeg2
 endif
+ifeq ($(X264),yes)
+PARTS += x264
+endif
 ifeq ($(INTERNAL_FAAD),yes)
 COMMON_LIBS += libfaad2/libfaad2.a 
 PARTS += libfaad2
@@ -235,6 +238,10 @@
 COMMON_DEPS += libmpeg2/libmpeg2.a
 COMMON_LIBS += libmpeg2/libmpeg2.a
 endif
+ifeq ($(X264),yes)
+COMMON_DEPS += x264/libx264.a
+COMMON_LIBS += x264/libx264.a
+endif
 ifeq ($(INTERNAL_FAAD),yes)
 COMMON_DEPS += libfaad2/libfaad2.a
 endif
@@ -314,6 +321,9 @@
 libmpeg2/libmpeg2.a:
 	$(MAKE) -C libmpeg2
 
+x264/libx264.a:
+	$(MAKE) -C x264
+
 libvo/libvo.a:
 	$(MAKE) -C libvo
 
@@ -423,6 +433,7 @@
                 $(ARCH_LIB) \
                 $(I18NLIBS) \
                 $(MATH_LIB) \
+                $(X_LIB) \
 
 $(PRG_MENCODER): $(MENCODER_DEP)
 	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER)