From 6aa6778ac46672dd237acc86856353d133917f06 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 20 Feb 2015 21:21:14 +0100
Subject: demux: change demux_open() signature

Fold the relatively obscure force_format parameter into demuxer_params.
---
 demux/demux_edl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'demux/demux_edl.c')

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);
-- 
cgit v1.2.3