diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
| commit | 8700700de8a4103724796077034f7f254ad974bc (patch) | |
| tree | 2fce4dee518a202c45c3f16567db36edc92ed914 /demux/demux.h | |
| parent | e6b85c91700bee0ddc92e98a30d5021691bd6f65 (diff) | |
| parent | eafc273d2c2ae6d247d741202e58ca23dc938cb2 (diff) | |
| download | mpv-8700700de8a4103724796077034f7f254ad974bc.tar.bz2 mpv-8700700de8a4103724796077034f7f254ad974bc.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'demux/demux.h')
| -rw-r--r-- | demux/demux.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux.h b/demux/demux.h index 39c2600257..18f52d463d 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -161,6 +161,7 @@ struct demuxer_params { int matroska_wanted_segment; bool *matroska_was_valid; struct timeline *timeline; + bool disable_timeline; // -- demux_open_url() only int stream_flags; bool allow_capture; |