[MPlayer-cvslog] CVS: main/libmpcodecs ve_xvid4.c,1.19,1.20

[Guillaume Poirier CVS]

CVS change done by Guillaume Poirier CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv19322/libmpcodecs

Modified Files:
	ve_xvid4.c 
Log Message:
make xvid encoding use the filename from
-passlogfile to store and retreive pass information.
Patch by Olivier Rolland < billl AH users POIS sf POIS net>
Original thread:
Date: Sep 25, 2005 9:41 PM
Subject: [MPlayer-dev-eng] [PATCH] XviD and -passlogfile


Index: ve_xvid4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid4.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ve_xvid4.c	18 Sep 2005 17:22:04 -0000	1.19
+++ ve_xvid4.c	26 Sep 2005 10:43:34 -0000	1.20
@@ -57,7 +57,6 @@
 
 #include "m_option.h"
 
-#define XVID_FIRST_PASS_FILENAME "xvid-twopass.stats"
 #define FINE (!0)
 #define BAD (!FINE)
 
@@ -230,6 +229,8 @@
  * Configuration options
  ****************************************************************************/
 
+extern char* passtmpfile;
+
 static int xvidenc_bitrate = 0;
 static int xvidenc_pass = 0;
 static float xvidenc_quantizer = 0;
@@ -1190,7 +1191,7 @@
 
 		/* There is not much to initialize for this plugin */
 		pass1->version  = XVID_VERSION;
-		pass1->filename = XVID_FIRST_PASS_FILENAME;
+		pass1->filename = passtmpfile;
 
 		create->plugins[create->num_plugins].func  = xvid_plugin_2pass1;
 		create->plugins[create->num_plugins].param = pass1;
@@ -1206,7 +1207,7 @@
 
 		/* There is not much left to initialize after dispatch settings */
 		pass2->version  = XVID_VERSION;
-		pass2->filename =  XVID_FIRST_PASS_FILENAME;
+		pass2->filename =  passtmpfile;
 
 		/* Positive bitrate values are bitrates as usual but if the
 		 * value is negative it is considered as being a total size