Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1146
diff -u -r1.1146 configure
--- configure	16 Mar 2006 21:56:22 -0000	1.1146
+++ configure	17 Mar 2006 03:35:20 -0000
@@ -6348,6 +6348,7 @@
 int main(void) { xvid_init(0, 0, 0, 0); return 0; }
 EOF
 _ld_xvid="$_ld_xvid -lxvidcore"
+_xvid4=no
 if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then
   _xvid=yes
   _def_xvid3='#define HAVE_XVID3 1'
@@ -6360,8 +6361,10 @@
 EOF
   if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then
     _xvid=yes
+    _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
@@ -7384,6 +7387,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_GPL=yes
 CONFIG_MUXERS=yes
 
@@ -7750,6 +7754,7 @@
 /* Use specific codecs from libavcodec */
 `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'`
 $_def_lavc_faac
+$_def_lavc_xvid
 
 /* Use codec libs included in mplayer CVS / source dist: */
 $_def_mp3lib
Index: DOCS/man/en/mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.1240
diff -u -r1.1240 mplayer.1
--- DOCS/man/en/mplayer.1	14 Mar 2006 23:33:36 -0000	1.1240
+++ DOCS/man/en/mplayer.1	17 Mar 2006 03:35:25 -0000
@@ -7088,7 +7088,17 @@
 .
 .TP
 .B vrc_strategy
-Dummy, reserved for future use.
+Ratecontrol method. Note that some of the ratecontrol-affecting options
+will have no effect if vrc_strategy is not set to 0.
+.PD 0
+.RSs
+.IPs 0
+Use internal lavc ratecontrol (default).
+.IPs 1
+Use XviD ratecontrol (experimental; requires MEncoder to be compiled
+with XviD support).
+.RE
+.PD 1
 .
 .TP
 .B vb_qfactor=<-31.0\-31.0>
Index: libmpcodecs/ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.133
diff -u -r1.133 ve_lavc.c
--- libmpcodecs/ve_lavc.c	13 Mar 2006 02:40:09 -0000	1.133
+++ libmpcodecs/ve_lavc.c	17 Mar 2006 03:35:25 -0000
@@ -74,7 +74,7 @@
 static int lavc_param_vmax_b_frames = 0;
 static int lavc_param_keyint = -1;
 static int lavc_param_vpass = 0;
-static int lavc_param_vrc_strategy = 2;
+static int lavc_param_vrc_strategy = 0;
 static int lavc_param_vb_strategy = 0;
 static int lavc_param_luma_elim_threshold = 0;
 static int lavc_param_chroma_elim_threshold = 0;