summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-04 01:55:52 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-04 01:55:52 +0200
commit8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch)
tree7ad930ebc554ab68af1911f4dfd217cc18b86cce /input
parent52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff)
parent8c5889004f7ba9f6fcbca20a05a9301771348408 (diff)
downloadmpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2
mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz
Merge svn changes up to r28087
Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
Diffstat (limited to 'input')
-rw-r--r--input/input.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/input/input.h b/input/input.h
index f033c31f0c..99fab98e77 100644
--- a/input/input.h
+++ b/input/input.h
@@ -209,7 +209,7 @@ typedef int (*mp_cmd_func_t)(int fd,char* dest,int size);
typedef void (*mp_close_func_t)(int fd);
// Set this to grab all incoming key codes
-extern int (*mp_input_key_cb)(int code);
+int (*mp_input_key_cb)(int code);
// Should return 1 if the command was processed
typedef int (*mp_input_cmd_filter)(mp_cmd_t* cmd, int paused, void* ctx);