summaryrefslogtreecommitdiffstats
path: root/demux/demux.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-04-23 19:21:17 +0200
committerwm4 <wm4@nowhere>2015-04-23 19:21:17 +0200
commite9ca0b1522a799e9d52e6aafc58fc316398f40b6 (patch)
tree026b8ff8e7cceff3ac259cefd4cab8fb594a8f51 /demux/demux.c
parent457e2f7e02e2952671b5923424d0a2b5295a1a6a (diff)
downloadmpv-e9ca0b1522a799e9d52e6aafc58fc316398f40b6.tar.bz2
mpv-e9ca0b1522a799e9d52e6aafc58fc316398f40b6.tar.xz
demux_mkv: move global options to the demuxer
The options don't change, but they're now declared and used privately by demux_mkv.c. This also brings with it a minor refactor of the subpreroll seek handling - merge the code from playloop.c into demux_mkv.c. The change in demux.c is pretty much equivalent as well.
Diffstat (limited to 'demux/demux.c')
-rw-r--r--demux/demux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux.c b/demux/demux.c
index a9671b31d2..bb367055cb 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -499,7 +499,7 @@ static void start_refreshing(struct demux_internal *in)
// Seek back to player's current position, with a small offset added.
in->d_thread->desc->seek(in->d_thread, start_ts - 1.0,
- SEEK_ABSOLUTE | SEEK_BACKWARD | SEEK_SUBPREROLL);
+ SEEK_ABSOLUTE | SEEK_BACKWARD | SEEK_HR);
pthread_mutex_lock(&in->lock);
}