summaryrefslogtreecommitdiffstats
path: root/demux/demux.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-19 20:45:31 +0100
committerwm4 <wm4@nowhere>2015-01-19 21:26:48 +0100
commit966f0a41a4182cf4027a5d49b248a26ff49368f3 (patch)
treec1c004fdb38ff443b16b44a3f505ddbd81b55f1e /demux/demux.c
parente972ff4857d6b7f6cd8240e199185fca39d5ea47 (diff)
downloadmpv-966f0a41a4182cf4027a5d49b248a26ff49368f3.tar.bz2
mpv-966f0a41a4182cf4027a5d49b248a26ff49368f3.tar.xz
demux_disc: pass seek flags to stream layer
Pass through the seek flags to the stream layer. The STREAM_CTRL semantics become a bit awkward, but that's still the least awkward part about optical disc media. Make demux_disc.c request relative seeks. Now the player will use relative seeks if the user sends relative seek commands, and the demuxer announces it wants these by setting rel_seeks to true. This change probably changes seek behavior for dvd, dvdnav, bluray, cdda, and possibly makes seeking useless if the demuxer-cache is set to a high value. Will be used in the next commit. (Split to make reverting the next commit easier.)
Diffstat (limited to 'demux/demux.c')
-rw-r--r--demux/demux.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux.c b/demux/demux.c
index c099dbac19..51131dfd4c 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -760,6 +760,7 @@ static void demux_copy(struct demuxer *dst, struct demuxer *src)
dst->seekable = src->seekable;
dst->filetype = src->filetype;
dst->ts_resets_possible = src->ts_resets_possible;
+ dst->rel_seeks = src->rel_seeks;
dst->start_time = src->start_time;
}
if (src->events & DEMUX_EVENT_STREAMS) {