summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--mencoder.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5cd711cec5..45e69bb809 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
$(DS_LIB) \
libaf/libaf.a \
libmpdemux/libmpdemux.a \
- input/libinput.a \
postproc/libswscale.a \
osdep/libosdep.a \
$(DVDREAD_LIB) \
@@ -370,6 +369,7 @@ endif
LIBS_MPLAYER = libvo/libvo.a \
libao2/libao2.a \
+ input/libinput.a \
$(MENU_LIBS) \
$(VIDIX_LIBS) \
$(GUI_LIBS) \
diff --git a/mencoder.c b/mencoder.c
index c234ecb00a..223f96de30 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -213,7 +213,11 @@ char *info_copyright=NULL;
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