diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-22 00:46:02 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-22 00:46:02 +0200 |
| commit | fccb0a7e45b61128262a396f2426bd7168fd198c (patch) | |
| tree | ac09e6b90d4389717f32181f8b6f3848ffb149fe /libvo/video_out.h | |
| parent | 71b25cca7644ab059393e9ee4682d79aab41ceba (diff) | |
| parent | ce821bd91f0b0c67b96f5d3b8f3fda19e1015294 (diff) | |
| download | mpv-fccb0a7e45b61128262a396f2426bd7168fd198c.tar.bz2 mpv-fccb0a7e45b61128262a396f2426bd7168fd198c.tar.xz | |
Merge svn changes up to r28176
Conflicts:
libvo/video_out.c
libvo/x11_common.c
Diffstat (limited to 'libvo/video_out.h')
| -rw-r--r-- | libvo/video_out.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index cc9544f4fb..465697927f 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -298,4 +298,10 @@ extern char *monitor_hfreq_str; extern char *monitor_vfreq_str; extern char *monitor_dotclock_str; +struct keymap { + int from; + int to; +}; +int lookup_keymap_table(const struct keymap *map, int key); + #endif /* MPLAYER_VIDEO_OUT_H */ |