Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1147
diff -u -r1.1147 configure
--- configure	17 Mar 2006 23:47:10 -0000	1.1147
+++ configure	19 Mar 2006 20:57:48 -0000
@@ -6364,7 +6364,6 @@
     _xvid4=yes
     _def_xvid3='#undef HAVE_XVID3'
     _def_xvid4='#define HAVE_XVID4 1'
-    _def_lavc_xvid='#define CONFIG_XVID 1'
     _codecmodules="xvid $_codecmodules"
   else
     _xvid=no
@@ -6376,6 +6375,22 @@
 fi
 echores "$_xvid"
 
+if test "$_xvid4" = yes ; then
+  echocheck "XviD 1.1 or higher"
+  cat > $TMPC << EOF
+#include <xvid.h>
+int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
+EOF
+  if cc_check $_inc_xvid $_ld_xvid $_ld_lb ; then
+    _xvid4_1_1=yes
+    _def_lavc_xvid='#define CONFIG_XVID 1'
+  else
+    _xvid4_1_1=no
+    _def_lavc_xvid='#undef CONFIG_XVID'
+  fi
+  echores "$_xvid4_1_1"
+fi
+
 _xvidcompat=no
 _def_decore_xvid='#undef DECORE_XVID'
 _def_encore_xvid='#undef ENCORE_XVID'
@@ -7387,7 +7402,7 @@
 AMR_WB=$_amr_wb
 `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
 CONFIG_FAAC=$_faac
-CONFIG_XVID=$_xvid4
+CONFIG_XVID=$_xvid4_1_1
 CONFIG_GPL=yes
 CONFIG_MUXERS=yes
 
Index: DOCS/man/en/mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.1241
diff -u -r1.1241 mplayer.1
--- DOCS/man/en/mplayer.1	17 Mar 2006 23:47:10 -0000	1.1241
+++ DOCS/man/en/mplayer.1	19 Mar 2006 20:57:48 -0000
@@ -7097,7 +7097,7 @@
 Use internal lavc ratecontrol (default).
 .IPs 1
 Use XviD ratecontrol (experimental; requires MEncoder to be compiled
-with XviD support).
+with support for XviD 1.1 or higher).
 .RE
 .PD 1
 .