diff options
| author | wm4 <wm4@nowhere> | 2015-04-23 19:21:17 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-04-23 19:21:17 +0200 |
| commit | e9ca0b1522a799e9d52e6aafc58fc316398f40b6 (patch) | |
| tree | 026b8ff8e7cceff3ac259cefd4cab8fb594a8f51 /player/playloop.c | |
| parent | 457e2f7e02e2952671b5923424d0a2b5295a1a6a (diff) | |
| download | mpv-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 'player/playloop.c')
| -rw-r--r-- | player/playloop.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/player/playloop.c b/player/playloop.c index 1c10c3e962..c34ae7e6da 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -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; |