Index: TOOLS/vivodump.c
===================================================================
--- TOOLS/vivodump.c	(revision 26966)
+++ TOOLS/vivodump.c	(working copy)
@@ -291,3 +291,7 @@
 
 return 0;
 }
+
+char* out_filename = NULL;
+char* force_fourcc=NULL;
+char* passtmpfile="divx2pass.log";
Index: Makefile
===================================================================
--- Makefile	(revision 26966)
+++ Makefile	(working copy)
 TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32
 
-#FIXME: Linking is broken, help welcome.
-TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TEST_OBJS)
+TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(OBJS_MPLAYER) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
+	$(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(COMMON_LDFLAGS)
 
 fastmemcpybench: TOOLS/fastmemcpybench.c
 	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF)  -DNAME=\"mmx\"      -DHAVE_MMX
Index: mplayer.c
===================================================================
--- mplayer.c	(revision 26966)
+++ mplayer.c	(working copy)
@@ -2537,6 +2538,7 @@
     return 0;
 }
 
+#if 0
 int main(int argc,char* argv[]){
 
 
@@ -4038,3 +4040,4 @@
 
 return 1;
 }
+#endif /* 0 */