diff options
Diffstat (limited to 'demux/timeline.c')
| -rw-r--r-- | demux/timeline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demux/timeline.c b/demux/timeline.c index 700a6dfd05..c44f67b166 100644 --- a/demux/timeline.c +++ b/demux/timeline.c @@ -14,7 +14,7 @@ struct timeline *timeline_load(struct mpv_global *global, struct mp_log *log, *tl = (struct timeline){ .global = global, .log = log, - .cancel = demuxer->stream->cancel, + .cancel = demuxer->cancel, .demuxer = demuxer, .track_layout = demuxer, }; @@ -34,9 +34,9 @@ void timeline_destroy(struct timeline *tl) for (int n = 0; n < tl->num_sources; n++) { struct demuxer *d = tl->sources[n]; if (d != tl->demuxer && d != tl->track_layout) - free_demuxer_and_stream(d); + demux_free(d); } if (tl->track_layout && tl->track_layout != tl->demuxer) - free_demuxer_and_stream(tl->track_layout); + demux_free(tl->track_layout); talloc_free(tl); } |