From 52c3eb69765a0d1070bf240353095c8ff546765b Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 11 Jul 2013 21:10:42 +0200 Subject: core: change open_stream and demux_open signature This removes the dependency on DEMUXER_TYPE_* and the file_format parameter from the stream open functions. Remove some of the playlist handling code. It looks like this was needed only for loading linked mov files with demux_mov (which was removed long ago). Delete a minor bit of dead network-related code from stream.c as well. --- core/input/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/input/input.c') diff --git a/core/input/input.c b/core/input/input.c index e87d9bb560..e736c6486d 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -1969,7 +1969,7 @@ static int parse_config_file(struct input_ctx *ictx, char *file, bool warn) "Input config file %s not found.\n", file); return 0; } - stream_t *s = open_stream(file, NULL, NULL); + stream_t *s = stream_open(file, NULL); if (!s) { mp_msg(MSGT_INPUT, MSGL_ERR, "Can't open input config file %s.\n", file); return 0; -- cgit v1.2.3