1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 17:42:17 +00:00
mpv/osdep
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
..
findfiles.c
findfiles.h
getch2-os2.c cosmetics: Remove pointless empty lines at EOF. 2010-02-20 21:02:49 +00:00
getch2-win.c Merge svn changes up to r30798 2010-03-10 02:35:02 +02:00
getch2.c cosmetics: Remove pointless empty lines at EOF. 2010-02-20 21:02:49 +00:00
getch2.h Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
gettimeofday.c osdep: Fix gettimeofday type to match the real one 2010-11-02 04:14:44 +02:00
glob-win.c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
glob.h
keycodes.h input: support bindings with modifier keys for X input 2010-12-20 19:02:24 +02:00
macosx_finder_args.c cleanup: remove NULL checks before free() all over the code 2010-11-14 13:11:20 +02:00
macosx_finder_args.h osdep/macosx_finder_args.h: include required header m_config.h 2010-11-02 04:16:46 +02:00
mmap_anon.c #include corresponding .h files in .c files. 2010-02-16 15:03:03 +00:00
mmap_anon.h
mmap-os2.c Do not cast the results of malloc/calloc/realloc. 2010-02-26 15:01:37 +00:00
mmap.h
mplayer.exe.manifest Windows support: add a manifest file 2010-11-02 04:14:20 +02:00
mplayer.rc Windows support: add a manifest file 2010-11-02 04:14:20 +02:00
numcores.c vd_ffmpeg: set thread count to number of cores on machine by default 2010-12-20 05:53:28 +02:00
numcores.h vd_ffmpeg: set thread count to number of cores on machine by default 2010-12-20 05:53:28 +02:00
osdep.h 1. Move the macros for priority classes for OS/2 from priority.c to osdep.h 2010-03-04 12:55:30 +00:00
priority.c Delete things related to old translation system 2010-03-10 03:47:14 +02:00
priority.h cosmetics: Remove pointless empty lines at EOF. 2010-02-20 21:02:49 +00:00
setenv.c
shmem.c #include corresponding .h files in .c files. 2010-02-16 15:03:03 +00:00
shmem.h
strsep.c Add a proper header for our strsep implementation so strsep will 2010-01-17 15:08:31 +00:00
strsep.h Add a proper header for our strsep implementation so strsep will 2010-01-17 15:08:31 +00:00
swab.c
timer-darwin.c Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
timer-linux.c #include corresponding .h files in .c files. 2010-02-16 15:03:03 +00:00
timer-win2.c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
timer.h
vsscanf.c