Mercurial > mplayer.hg

diff mplayer.c @ 26963:8825552ee585

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
author diego
date Fri, 06 Jun 2008 13:28:25 +0000
parents 4ab1cfcee430
children 4bee4b9ec054
line wrap: on
line diff
--- a/mplayer.c	Fri Jun 06 00:45:35 2008 +0000
+++ b/mplayer.c	Fri Jun 06 13:28:25 2008 +0000
@@ -2537,6 +2537,9 @@
     return 0;
 }
 
+/* This preprocessor directive is a hack to generate a mplayer-nomain.o object
+ * file for some tools to link against. */
+#ifndef DISABLE_MAIN
 int main(int argc,char* argv[]){
 
 
@@ -4038,3 +4041,4 @@
 
 return 1;
 }
+#endif /* DISABLE_MAIN */