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/playlist_parser.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'core/playlist_parser.c') diff --git a/core/playlist_parser.c b/core/playlist_parser.c index 67d58024c1..59d5123be6 100644 --- a/core/playlist_parser.c +++ b/core/playlist_parser.c @@ -699,10 +699,7 @@ err_out: struct playlist *playlist_parse_file(const char *file) { - stream_t *stream; - int f=DEMUXER_TYPE_PLAYLIST; - - stream = open_stream(file, 0, &f); + stream_t *stream = stream_open(file, NULL); if(!stream) { mp_msg(MSGT_PLAYTREE,MSGL_ERR, "Error while opening playlist file %s: %s\n", -- cgit v1.2.3