diff options
| author | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-25 18:28:17 +0900 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-25 18:28:17 +0900 |
| commit | 5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3 (patch) | |
| tree | 6b757d37d296709dfd5955ef9d4d41426cd47da6 /player/playloop.c | |
| parent | d64ff3aa51b49451348383a6ff6de7697a52dc62 (diff) | |
| parent | 983d24e3b9ce9c9c7755279138c14170e85fbf37 (diff) | |
| download | mpv-5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3.tar.bz2 mpv-5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3.tar.xz | |
Merge branch 'master' into release/0.9
* master: (87 commits)
manpage: move --autosync description
player: add --window-scale option
player: flush decoder even if cover art is decoded
player: don't show A/V desync message in non-sense situations
w32_common: add more rounded-down frame rates
w32_common: use the current monitor's refresh rate
dxva2: fix broken build with gcc 5.1
terminal: printf() is not signal-safe
man: fix PDF build
DOCS/mplayer-changes: Eleborate on joystick input
osc: add nil check for element.eventresponder
mp_image: remove some unused interlacing flags
vf_vapoursynth: update _FieldBased semantics
options: remove unneeded hack from command line parser
manpage: document ff-index sub-property
demux_mkv: limit timestamp fixing to 1ms max
demux_mkv: attempt to fix rounded timestamps
demux_mkv: move global options to the demuxer
demux_mkv: better seeking after video end
lua: add utils.format_json() function
...
Diffstat (limited to 'player/playloop.c')
| -rw-r--r-- | player/playloop.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/player/playloop.c b/player/playloop.c index 1f480cf3ba..c34ae7e6da 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -67,7 +67,7 @@ void mp_process_input(struct MPContext *mpctx) mp_cmd_t *cmd = mp_input_read_cmd(mpctx->input); if (!cmd) break; - run_command(mpctx, cmd); + run_command(mpctx, cmd, NULL); mp_cmd_free(cmd); mp_dispatch_queue_process(mpctx->dispatch, 0); } @@ -240,8 +240,6 @@ static int mp_seek(MPContext *mpctx, struct seek_params seek, } if (hr_seek) demuxer_style |= SEEK_HR; - if (hr_seek || opts->mkv_subtitle_preroll) - demuxer_style |= SEEK_SUBPREROLL; if (hr_seek) demuxer_amount -= hr_seek_offset; |