[Mplayer-cvslog] CVS: main mencoder.c,1.105,1.106 cfg-mencoder.h,1.31,1.32
Richard Felker CVS
rfelker at mplayer.dev.hu
Fri Mar 29 08:20:55 CET 2002
Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv7376
Modified Files:
mencoder.c cfg-mencoder.h
Log Message:
libavcodec 2pass broke mencoder if divx4encore was not available. fixed.
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- mencoder.c 29 Mar 2002 03:17:57 -0000 1.105
+++ mencoder.c 29 Mar 2002 07:20:44 -0000 1.106
@@ -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;
Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cfg-mencoder.h 28 Mar 2002 05:01:09 -0000 1.31
+++ cfg-mencoder.h 29 Mar 2002 07:20:44 -0000 1.32
@@ -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
More information about the MPlayer-cvslog
mailing list