diff options
| author | wm4 <wm4@nowhere> | 2015-06-24 21:26:06 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-06-24 21:26:06 +0200 |
| commit | e4c5876f574432ea852e58e8f4469cc775c7201e (patch) | |
| tree | 77dc9cefa47eaf8d323ff6894eb7abe19969e2db /player/loadfile.c | |
| parent | ab2e3cf6f9769c53fee9638f07af52027f718016 (diff) | |
| download | mpv-e4c5876f574432ea852e58e8f4469cc775c7201e.tar.bz2 mpv-e4c5876f574432ea852e58e8f4469cc775c7201e.tar.xz | |
player, demux: replace some demux_open() uses with demux_open_url()
Diffstat (limited to 'player/loadfile.c')
| -rw-r--r-- | player/loadfile.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 6b25706055..cef35cc485 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -875,14 +875,11 @@ static void load_chapters(struct MPContext *mpctx) bool free_src = false; char *chapter_file = mpctx->opts->chapter_file; if (chapter_file && chapter_file[0]) { - struct stream *stream = stream_create(chapter_file, STREAM_READ, + struct demuxer *demux = demux_open_url(chapter_file, NULL, mpctx->playback_abort, mpctx->global); - if (stream) { - struct demuxer *demux = demux_open(stream, NULL, mpctx->global); - if (demux) { - src = demux; - free_src = true; - } + if (demux) { + src = demux; + free_src = true; } talloc_free(mpctx->chapters); mpctx->chapters = NULL; @@ -892,11 +889,8 @@ static void load_chapters(struct MPContext *mpctx) mpctx->num_chapters = src->num_chapters; mpctx->chapters = demux_copy_chapter_data(src->chapters, src->num_chapters); } - if (free_src) { - struct stream *s = src->stream; - free_demuxer(src); - free_stream(s); - } + if (free_src) + free_demuxer_and_stream(src); } static void load_per_file_options(m_config_t *conf, |