summaryrefslogtreecommitdiffstats
path: root/demux/demux_mkv_timeline.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-20 21:21:14 +0100
committerwm4 <wm4@nowhere>2015-02-20 21:21:14 +0100
commit6aa6778ac46672dd237acc86856353d133917f06 (patch)
treed7e19e4c35ea99193b826fcd78e975c1bc376f62 /demux/demux_mkv_timeline.c
parent6c1355be967751b194504ed73b053846fbae5fa9 (diff)
downloadmpv-6aa6778ac46672dd237acc86856353d133917f06.tar.bz2
mpv-6aa6778ac46672dd237acc86856353d133917f06.tar.xz
demux: change demux_open() signature
Fold the relatively obscure force_format parameter into demuxer_params.
Diffstat (limited to 'demux/demux_mkv_timeline.c')
-rw-r--r--demux/demux_mkv_timeline.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c
index 735678f7db..64d4583979 100644
--- a/demux/demux_mkv_timeline.c
+++ b/demux/demux_mkv_timeline.c
@@ -167,7 +167,7 @@ static int enable_cache(struct mpv_global *global, struct stream **stream,
stream_enable_cache(stream, &opts->stream_cache);
- *demuxer = demux_open(*stream, "mkv", params, global);
+ *demuxer = demux_open(*stream, params, global);
if (!*demuxer) {
talloc_free(filename);
free_stream(*stream);
@@ -197,6 +197,7 @@ static bool check_file_seg(struct tl_ctx *ctx, struct demuxer ***sources,
{
bool was_valid = false;
struct demuxer_params params = {
+ .force_format = "mkv",
.matroska_num_wanted_uids = *num_sources,
.matroska_wanted_uids = *uids,
.matroska_wanted_segment = segment,
@@ -205,7 +206,7 @@ static bool check_file_seg(struct tl_ctx *ctx, struct demuxer ***sources,
struct stream *s = stream_open(filename, ctx->global);
if (!s)
return false;
- struct demuxer *d = demux_open(s, "mkv", &params, ctx->global);
+ struct demuxer *d = demux_open(s, &params, ctx->global);
if (!d) {
free_stream(s);