# HG changeset patch
# User rfelker
# Date 1017386444 0
# Node ID 386f6fcc92d556243d9d4db379ed3b9c69d8bc9e
# Parent  7296c426245756bc4c6c0ec535ad72436c324e8e
libavcodec 2pass broke mencoder if divx4encore was not available. fixed.

diff -r 7296c4262457 -r 386f6fcc92d5 cfg-mencoder.h
--- a/cfg-mencoder.h	Fri Mar 29 05:03:25 2002 +0000
+++ b/cfg-mencoder.h	Fri Mar 29 07:20:44 2002 +0000
@@ -129,10 +129,10 @@
 
 	{"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4, NULL},
 
-#ifdef HAVE_DIVX4ENCORE
 	{"pass", &pass, CONF_TYPE_INT, CONF_RANGE,0,2, NULL},
 	{"passlogfile", &passtmpfile, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	
+#ifdef HAVE_DIVX4ENCORE
 	{"divx4opts", divx4opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
 #ifdef HAVE_MP3LAME
diff -r 7296c4262457 -r 386f6fcc92d5 mencoder.c
--- a/mencoder.c	Fri Mar 29 05:03:25 2002 +0000
+++ b/mencoder.c	Fri Mar 29 07:20:44 2002 +0000
@@ -183,11 +183,9 @@
 
 char *force_fourcc=NULL;
 
-#ifdef HAVE_DIVX4ENCORE
 static int pass=0;
 static char* passtmpfile="divx2pass.log";
 int pass_working=0;
-#endif
 
 static int play_n_frames=-1;