diff -Nur -x CVS -x '.*' main/DOCS/man/en/mplayer.1 main_modif/DOCS/man/en/mplayer.1
--- main/DOCS/man/en/mplayer.1	2004-10-11 21:28:56.000000000 +0200
+++ main_modif/DOCS/man/en/mplayer.1	2004-10-12 22:58:27.000000000 +0200
@@ -6340,6 +6340,13 @@
 Specify the pass in 2pass mode.
 .
 .TP
+.B twopass_file=<filename>
+Dump first pass information to <filename> instead of the
+default ./xvid-twopass.stats in 2-pass encoding mode.
+This could be useful if you run multiple MEncoder instances in the same
+directory.
+.
+.TP
 .B bitrate=<value>
 Sets the bitrate to be used in kbits/\:second if <16000 or in bits/\:second
 if >16000.
diff -Nur -x CVS -x '.*' main/DOCS/man/fr/mplayer.1 main_modif/DOCS/man/fr/mplayer.1
--- main/DOCS/man/fr/mplayer.1	2004-10-12 21:06:09.000000000 +0200
+++ main_modif/DOCS/man/fr/mplayer.1	2004-10-12 22:57:45.000000000 +0200
@@ -6615,6 +6615,13 @@
 Définit la passe en mode 2passes.
 .
 .TP
+.B twopass_file=<nomfichier>
+Envoie les statistiques de la première passe du mode deux passes dans
+<nomfichier> au lieu de ./xvid-twopass.stats par défaut.
+Cela peut vous être utile si vous lancez plusieurs instances de MEncoder
+depuis le même répertoire.
+.
+.TP
 .B bitrate=<valeur>
 Fixe le débit binaire (bitrate) à utiliser en kbits/\:seconde si <16000 ou
 en bits/\:seconde
diff -Nur -x CVS -x '.*' main/libmpcodecs/ve_xvid4.c main_modif/libmpcodecs/ve_xvid4.c
--- main/libmpcodecs/ve_xvid4.c	2004-10-11 19:48:56.000000000 +0200
+++ main_modif/libmpcodecs/ve_xvid4.c	2004-10-12 22:37:46.000000000 +0200
@@ -57,7 +57,7 @@
 
 #include "m_option.h"
 
-#define XVID_FIRST_PASS_FILENAME "xvid-twopass.stats"
+#define XVID_DEFAULT_FIRST_PASS_FILENAME "xvid-twopass.stats"
 #define FINE (!0)
 #define BAD (!FINE)
 
@@ -148,6 +148,7 @@
 static int xvidenc_bitrate = 0;
 static int xvidenc_pass = 0;
 static float xvidenc_quantizer = 0;
+static char *xvidenc_firstpass_filename = NULL;
 
 static int xvidenc_packed = 0;
 static int xvidenc_closed_gop = 1;
@@ -208,6 +209,9 @@
 	{"pass", &xvidenc_pass, CONF_TYPE_INT, CONF_RANGE, 1, 2, NULL},
 	{"fixed_quant", &xvidenc_quantizer, CONF_TYPE_FLOAT, CONF_RANGE, 1, 31, NULL},
 
+	/* 2pass stats filename */
+	{"twopass_file", &xvidenc_firstpass_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
+
 	/* Features */
 	{"quant_type", &xvidenc_quant_method, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"me_quality", &xvidenc_motion, CONF_TYPE_INT, CONF_RANGE, 0, 6, NULL},
@@ -986,7 +990,9 @@
 
 		/* There is not much to initialize for this plugin */
 		pass1->version  = XVID_VERSION;
-		pass1->filename = XVID_FIRST_PASS_FILENAME;
+		pass1->filename = (xvidenc_firstpass_filename)
+		       ? xvidenc_firstpass_filename
+		       : XVID_DEFAULT_FIRST_PASS_FILENAME;
 
 		create->plugins[create->num_plugins].func  = xvid_plugin_2pass1;
 		create->plugins[create->num_plugins].param = pass1;
@@ -1002,7 +1008,9 @@
 
 		/* There is not much left to initialize after dispatch settings */
 		pass2->version  = XVID_VERSION;
-		pass2->filename =  XVID_FIRST_PASS_FILENAME;
+		pass2->filename =  (xvidenc_firstpass_filename)
+		       ? xvidenc_firstpass_filename
+		       : XVID_DEFAULT_FIRST_PASS_FILENAME;
 
 		/* Positive bitrate values are bitrates as usual but if the
 		 * value is negative it is considered as being a total size