summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-06 13:28:25 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-06 13:28:25 +0000
commitf9810c0dfb769caa7e67660e59727aaf6b00fdbc (patch)
treeb3bba789c738aedb04f65dc9c8859b1f0a0a644d /mplayer.c
parent92f79295d22d4d8810c7c02a006c47f3ab8dd8ab (diff)
downloadmpv-f9810c0dfb769caa7e67660e59727aaf6b00fdbc.tar.bz2
mpv-f9810c0dfb769caa7e67660e59727aaf6b00fdbc.tar.xz
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26995 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index bfe6f695c8..a5adb72918 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2537,6 +2537,9 @@ static int seek(MPContext *mpctx, double amount, int style)
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 @@ exit_player_with_rc(MSGTR_Exit_eof, 0);
return 1;
}
+#endif /* DISABLE_MAIN */