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/timeline/tl_edl.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/timeline/tl_edl.c')
| -rw-r--r-- | core/timeline/tl_edl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/timeline/tl_edl.c b/core/timeline/tl_edl.c index 0303956513..6096d03b6a 100644 --- a/core/timeline/tl_edl.c +++ b/core/timeline/tl_edl.c @@ -354,13 +354,10 @@ void build_edl_timeline(struct MPContext *mpctx) mpctx->num_sources = 1; for (int i = 0; i < num_sources; i++) { - int format = 0; - struct stream *s = open_stream(edl_ids[i].filename, &mpctx->opts, - &format); + struct stream *s = stream_open(edl_ids[i].filename, &mpctx->opts); if (!s) goto openfail; - struct demuxer *d = demux_open(&mpctx->opts, s, format, - edl_ids[i].filename); + struct demuxer *d = demux_open(s, NULL, NULL, &mpctx->opts); if (!d) { free_stream(s); openfail: |