summaryrefslogtreecommitdiffstats
path: root/demux/timeline.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-20 21:08:10 +0100
committerwm4 <wm4@nowhere>2015-02-20 21:08:10 +0100
commit6c1355be967751b194504ed73b053846fbae5fa9 (patch)
tree078c7a52448a2e47fb32e8ed56e67ccf8805acec /demux/timeline.c
parent44411674ebb764adeb806040d24700bc4cc493cc (diff)
downloadmpv-6c1355be967751b194504ed73b053846fbae5fa9.tar.bz2
mpv-6c1355be967751b194504ed73b053846fbae5fa9.tar.xz
demux: add free_demuxer_and_stream() function
Although their lifetimes are conceptually different, it happens often that a demuxer is destroyed together with its stream.
Diffstat (limited to 'demux/timeline.c')
-rw-r--r--demux/timeline.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/demux/timeline.c b/demux/timeline.c
index 6274c25fa3..9910abf46d 100644
--- a/demux/timeline.c
+++ b/demux/timeline.c
@@ -32,11 +32,8 @@ void timeline_destroy(struct timeline *tl)
return;
for (int n = 0; n < tl->num_sources; n++) {
struct demuxer *d = tl->sources[n];
- if (d != tl->demuxer) {
- struct stream *s = d->stream;
- free_demuxer(d);
- free_stream(s);
- }
+ if (d != tl->demuxer)
+ free_demuxer_and_stream(d);
}
talloc_free(tl);
}