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_mf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stream/stream_mf.c') diff --git a/stream/stream_mf.c b/stream/stream_mf.c index 9b8b47188a..eef5d6fc4d 100644 --- a/stream/stream_mf.c +++ b/stream/stream_mf.c @@ -29,10 +29,10 @@ #include "demux/demux.h" static int -mf_stream_open (stream_t *stream, int mode, void *opts, int *file_format) +mf_stream_open (stream_t *stream, int mode, void *opts) { stream->type = STREAMTYPE_MF; - *file_format = DEMUXER_TYPE_MF; + stream->demuxer = "lavf"; return STREAM_OK; } -- cgit v1.2.3