Mercurial > mplayer.hg

changeset 5390:386f6fcc92d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libavcodec 2pass broke mencoder if divx4encore was not available. fixed.
author rfelker
date Fri, 29 Mar 2002 07:20:44 +0000
parents 7296c4262457
children 7a4ea9beebc0
files cfg-mencoder.h mencoder.c
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;