diff options
| author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
| commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
| tree | 199bddd30923db1175a1331191eb86ba684e9e41 /core/playlist_parser.c | |
| parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
| parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
| download | mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2 mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz | |
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.
Conflicts:
stream/stream.c
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", |