diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
| commit | ad56f2c46ac6deec86870ec10f2a11a644df07d4 (patch) | |
| tree | 89f2d90c5586560911e67c872b530c77f151168d /demux/demux.c | |
| parent | 0536841647ef7931bffb4386d8ffbb5b2b568e8a (diff) | |
| parent | 393bb2a565dc1e27812e1dd20747814892f80da2 (diff) | |
| download | mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.bz2 mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'demux/demux.c')
| -rw-r--r-- | demux/demux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux.c b/demux/demux.c index bedc2bf294..6038d244e0 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -1129,6 +1129,7 @@ static struct demuxer *open_given_type(struct mpv_global *global, ¶ms2, DEMUX_CHECK_FORCE); if (sub) return sub; + timeline_destroy(tl); } return demuxer; } |