summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-12 22:26:15 +0200
committerwm4 <wm4@nowhere>2013-07-12 22:29:34 +0200
commit6c1e9e4a45d92216a1433ed73ba8f2e09529ca19 (patch)
tree5c54fa53c2f66f39eed77964996747bb2883c142
parent5de4a3ecc0f8fce923b3016e62d44351b2457fc2 (diff)
downloadmpv-6c1e9e4a45d92216a1433ed73ba8f2e09529ca19.tar.bz2
mpv-6c1e9e4a45d92216a1433ed73ba8f2e09529ca19.tar.xz
demux: make claiming accurate seek the default
Enables hr-seek for raw audio/video demuxers.
-rw-r--r--demux/demux.c1
-rw-r--r--demux/demux_mkv.c2
-rw-r--r--demux/demux_mng.c3
-rw-r--r--demux/demux_subreader.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 836c945bc4..1783f92c96 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -534,6 +534,7 @@ static struct demuxer *open_given_type(struct MPOpts *opts,
.movi_start = stream->start_pos,
.movi_end = stream->end_pos,
.seekable = 1,
+ .accurate_seek = true,
.filepos = -1,
.opts = opts,
.filename = talloc_strdup(demuxer, stream->url),
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 69ace3b4db..76b7c1d059 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1803,8 +1803,6 @@ static int demux_mkv_open(demuxer_t *demuxer, enum demux_check check)
demuxer->seekable = 1;
}
- demuxer->accurate_seek = true;
-
return 0;
}
diff --git a/demux/demux_mng.c b/demux/demux_mng.c
index ea82ab257f..f6cb66302c 100644
--- a/demux/demux_mng.c
+++ b/demux/demux_mng.c
@@ -421,6 +421,9 @@ static int demux_mng_open(demuxer_t * demuxer, enum demux_check check)
sh_video->bih->biBitCount = 32;
sh_video->bih->biPlanes = 1;
+ // weirdly broken
+ demuxer->accurate_seek = false;
+
// set private data in demuxer and return demuxer
demuxer->priv = mng_priv;
return 0;
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index 9f7af4e365..6cbea0d8ec 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -1356,8 +1356,6 @@ static int d_open_file(struct demuxer *demuxer, enum demux_check check)
add_sub_data(demuxer, sd);
subdata_free(sd);
- demuxer->accurate_seek = true;
-
return 0;
}