Mercurial > mplayer.hg

changeset 18267:89bd33b746b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
No need to include the whole libinput in mencoder for a single useless function.
author albeu
date Tue, 25 Apr 2006 02:01:21 +0000
parents 2bf9ae91ff54
children 3f59096edb2f
files Makefile mencoder.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Apr 25 01:38:02 2006 +0000
+++ b/Makefile	Tue Apr 25 02:01:21 2006 +0000
@@ -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) \
--- a/mencoder.c	Tue Apr 25 01:38:02 2006 +0000
+++ b/mencoder.c	Tue Apr 25 02:01:21 2006 +0000
@@ -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