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. --- stream/stream_file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'stream/stream_file.c') diff --git a/stream/stream_file.c b/stream/stream_file.c index 924eb31dad..79ebbb3eef 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -110,7 +110,8 @@ static int control(stream_t *s, int cmd, void *arg) { return STREAM_UNSUPPORTED; } -static int open_f(stream_t *stream,int mode, void* opts, int* file_format) { +static int open_f(stream_t *stream,int mode, void* opts) +{ int f; mode_t m = 0; int64_t len; -- cgit v1.2.3