diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-12-20 19:17:43 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-12-20 19:17:43 +0200 |
| commit | 0afb326035e66663a90c4609f21560ce772e9718 (patch) | |
| tree | 07f443e2bd39745ac7430cff9534529958be9c53 /DOCS/tech | |
| parent | 4a26b4c024498c9b1be4723121d86e0c2b386ed2 (diff) | |
| parent | 5bb2f9787f557bd91d5eb9021238ed7b131d5fa9 (diff) | |
| download | mpv-0afb326035e66663a90c4609f21560ce772e9718.tar.bz2 mpv-0afb326035e66663a90c4609f21560ce772e9718.tar.xz | |
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
Diffstat (limited to 'DOCS/tech')
| -rw-r--r-- | DOCS/tech/slave.txt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt index 1dc9e23aa4..d95ef41d84 100644 --- a/DOCS/tech/slave.txt +++ b/DOCS/tech/slave.txt @@ -269,11 +269,16 @@ radio_step_channel <-1|1> radio_step_freq <value> Tune frequency by the <value> (positive - up, negative - down). -seek <value> [type] +seek <value> [type] [hr-seek] Seek to some place in the movie. - 0 is a relative seek of +/- <value> seconds (default). - 1 is a seek to <value> % in the movie. - 2 is a seek to an absolute position of <value> seconds. + type = 0 is a relative seek of +/- <value> seconds (default). + type = 1 is a seek to <value> % in the movie. + type = 2 is a seek to an absolute position of <value> seconds. + The hr-seek parameter controls whether to use precise seeks (not limited + to keyframe positions in video). + hr-seek = 0 means use default set with option -hr-seek (default). + hr-seek = 1 means force precise seek if possible. + hr-seek = -1 means force non-precise seek. seek_chapter <value> [type] Seek to the start of a chapter. @@ -515,6 +520,8 @@ name type min max get set step comment osdlevel int 0 3 X X X as -osdlevel speed float 0.01 100 X X X as -speed loop int -1 X X X as -loop +hr_seek string X X X as -hr-seek +pts_association_mode string X X X as -pts-association-mode pause flag 0 1 X 1 if paused filename string X file playing wo path path string X file playing |