# HG changeset patch
# User diego
# Date 1183454087 0
# Node ID 4212a3701effde953f2c453b7dd7ec50513ddf88
# Parent  4566261f75deed71ca85a0548c7302f0e83d24af
Sync FFmpeg changes:
CONFIG_X264 --> CONFIG_LIBX264, CONFIG_XVID --> CONFIG_LIBXVID

diff -r 4566261f75de -r 4212a3701eff configure
--- a/configure	Tue Jul 03 08:28:44 2007 +0000
+++ b/configure	Tue Jul 03 09:14:47 2007 +0000
@@ -6365,10 +6365,10 @@
 EOF
   if cc_check ; then
     _lavc_xvid=yes
-    _def_lavc_xvid='#define CONFIG_XVID 1'
+    _def_lavc_xvid='#define CONFIG_LIBXVID 1'
   else
     _lavc_xvid=no
-    _def_lavc_xvid='#undef CONFIG_XVID'
+    _def_lavc_xvid='#undef CONFIG_LIBXVID'
   fi
   echores "$_lavc_xvid"
 fi
@@ -6396,17 +6396,17 @@
   _codecmodules="x264 $_codecmodules"
   if echo $_libavencoders | grep -q X264 ; then
     _lavc_x264=yes
-    _def_lavc_x264='#define CONFIG_X264 1'
+    _def_lavc_x264='#define CONFIG_LIBX264 1'
     _libs_mplayer="$_libs_mplayer $_ld_x264"
   else
     _lavc_x264=no
-    _def_lavc_x264='#undef CONFIG_X264'
+    _def_lavc_x264='#undef CONFIG_LIBX264'
   fi
 else
   _x264=no
   _lavc_x264=no
   _def_x264='#undef HAVE_X264'
-  _def_lavc_x264='#undef CONFIG_X264'
+  _def_lavc_x264='#undef CONFIG_LIBX264'
   _nocodecmodules="x264 $_nocodecmodules"
   _libavencoders=`echo $_libavencoders | sed -e s/LIBX264_ENCODER// `
 fi