[MPlayer-cvslog] CVS: main Makefile, 1.366, 1.367 mencoder.c, 1.350, 1.351

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv6729

Modified Files:
	Makefile mencoder.c 
Log Message:
No need to include the whole libinput in mencoder
for a single useless function.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- Makefile	4 Apr 2006 06:48:14 -0000	1.366
+++ Makefile	25 Apr 2006 02:01:21 -0000	1.367
@@ -111,7 +111,6 @@
               $(DS_LIB) \
               libaf/libaf.a \
               libmpdemux/libmpdemux.a \
-              input/libinput.a \
               postproc/libswscale.a \
               osdep/libosdep.a \
               $(DVDREAD_LIB) \
@@ -370,6 +369,7 @@
 
 LIBS_MPLAYER = libvo/libvo.a \
                libao2/libao2.a \
+               input/libinput.a \
                $(MENU_LIBS) \
                $(VIDIX_LIBS) \
                $(GUI_LIBS) \

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- mencoder.c	24 Apr 2006 07:20:32 -0000	1.350
+++ mencoder.c	25 Apr 2006 02:01:21 -0000	1.351
@@ -213,7 +213,11 @@
 char *info_sourceform=NULL;
 char *info_comment=NULL;
 
-
+// Needed by libmpdemux.
+int mp_input_check_interrupt(int time) {
+  usec_sleep(time);
+  return 0;
+}
 
 //char *out_audio_codec=NULL; // override audio codec
 //char *out_video_codec=NULL; // override video codec