diff options
| author | wm4 <wm4@nowhere> | 2013-07-11 21:10:42 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-12 21:56:40 +0200 |
| commit | 52c3eb69765a0d1070bf240353095c8ff546765b (patch) | |
| tree | db654a9798f4941dbc3b57c8569fcdeb0b21d24a /core/playlist_parser.c | |
| parent | d17d2fdc7c536821b3fea8c4a37c0ad09fc487db (diff) | |
| download | mpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.bz2 mpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.xz | |
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.
Diffstat (limited to 'core/playlist_parser.c')
| -rw-r--r-- | core/playlist_parser.c | 5 |
1 files changed, 1 insertions, 4 deletions
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", |