diff options
author | wm4 <wm4@nowhere> | 2015-02-20 21:21:14 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-02-20 21:21:14 +0100 |
commit | 6aa6778ac46672dd237acc86856353d133917f06 (patch) | |
tree | d7e19e4c35ea99193b826fcd78e975c1bc376f62 /demux/demux_edl.c | |
parent | 6c1355be967751b194504ed73b053846fbae5fa9 (diff) | |
download | mpv-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_edl.c')
-rw-r--r-- | demux/demux_edl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_edl.c b/demux/demux_edl.c index f12ca2c8a1..ba88e6a3d5 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -141,7 +141,7 @@ static struct demuxer *open_file(char *filename, struct timeline *tl) struct stream *s = stream_open(filename, tl->global); if (s) { stream_enable_cache(&s, &opts->stream_cache); - d = demux_open(s, NULL, NULL, tl->global); + d = demux_open(s, NULL, tl->global); } if (!d) { MP_ERR(tl, "EDL: Could not open source file '%s'.\n", filename); |