Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.330
diff -r1.330 Makefile
182a183,186
> ifeq ($(INTERNAL_X264),yes)
> COMMON_LIBS += x264/libx264.a 
> PARTS += x264
> endif
241a246,248
> ifeq ($(INTERNAL_X264),yes)
> COMMON_DEPS += x264/libx264.a
> endif
324a332,334
> x264/libx264.a:
> 	$(MAKE) -C x264 libx264.a
> 
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1045
diff -r1.1045 configure
213a214
>   --disable-internal-x264  disable internal H.264 encoder [autodetect]
1436a1438
> _x264_internal=auto
1669a1672,1673
>   --enable-internal-x264)   _x264_internal=yes        ;;
>   --disable-internal-x264)  _x264_internal=no        ;;
5907c5911
< if test "$_libavcodec" != yes ; then
---
> if test "$_libavcodec" = auto ; then
6143a6148,6160
> if test "$_x264" != no && test "$_x264_internal" != no && \
> test "$_inc_x264" = "" && test "$_ld_x264" = "" && \
> test -d x264 && test -f x264/x264.h ; then
>   _x264=yes
>   _x264_internal=yes
>   _ld_x264=''
>   _inc_x264='-I../x264'
>   _def_x264='#define HAVE_X264 1'
>   _codecmodules="x264(internal) $_codecmodules"
>   echores "$_x264 (internal)"
> else
>   _x264_internal=no
> 
6166a6184
> fi
7064a7083
> INTERNAL_X264 = $_x264_internal
7810a7830,7841
> echo "Creating x264/config.mak"
> ( cd x264 ; ./configure )
> #cat > x264/config.mak << EOF
> #include ../config.mak
> #CFLAGS = \$(OPTFLAGS) -D__X264__ -I.
> #AS=nasm
> #ASFLAGS=-f elf
> #VIS=no
> #EOF
> 
> #############################################################################
>