Uoti Urpala 0afb326035 Merge branch 'hr-seek' ... * hr-seek: input: add default keybindings Shift+[arrow] for small exact seeks input: support bindings with modifier keys for X input core: audio: make ogg missing audio timing workaround more complex core: add support for precise non-keyframe-limited seeks core: add struct for queued seek info commands: add generic option -> property wrapper options: add "choice" option type, use for -pts-association-mode core: remove looping in update_video(), modify command handling a bit core: seek: use accurate seek mode with audio-only files core: avoid using sh_video->pts as "current pts" libvo: register X11 connection fd in input event system core: timing: add special handling of long frame intervals core: move central play loop to a separate function Conflicts: DOCS/tech/slave.txt		2010-12-20 19:17:43 +02:00
..
codecs.conf	codecs.conf: add ffmpeg g722 audio codec	2010-12-16 05:05:41 +02:00
dvb-menu.conf	cosmetics: Remove pointless empty lines at EOF.	2010-02-20 21:02:49 +00:00
example.conf	example.conf: add some profile information and user-agent examples	2010-12-16 06:22:19 +02:00
input.conf	input: add default keybindings Shift+[arrow] for small exact seeks	2010-12-20 19:02:24 +02:00
inttypes.h	Simplified support for libc5 systems.	2004-01-30 09:07:28 +00:00
menu.conf	cosmetics: Remove pointless empty lines at EOF.	2010-02-20 21:02:49 +00:00
mplayer.desktop	mplayer.desktop: Add video/3gpp and application/x-flash-video mime types	2010-11-08 18:03:35 +02:00
mplayer.ico	mplayer 64x64 256color icon	2003-04-20 11:51:04 +00:00
mplayer.xpm	Add 32x32 XPM icon as mandated by Debian policy.	2006-04-04 06:48:14 +00:00