diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /demux/demux.h | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'demux/demux.h')
| -rw-r--r-- | demux/demux.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demux/demux.h b/demux/demux.h index 0e5a5e15c6..8a1da4e400 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -162,9 +162,11 @@ struct demuxer_params { bool *matroska_was_valid; struct timeline *timeline; bool disable_timeline; + bool initial_readahead; + bstr init_fragment; + bool skip_lavf_probing; // -- demux_open_url() only int stream_flags; - bool allow_capture; bool disable_cache; // result bool demuxer_failed; @@ -287,8 +289,6 @@ double demuxer_get_time_length(struct demuxer *demuxer); int demux_stream_control(demuxer_t *demuxer, int ctrl, void *arg); -void demux_run_on_thread(struct demuxer *demuxer, void (*fn)(void *), void *ctx); - void demux_changed(demuxer_t *demuxer, int events); void demux_update(demuxer_t *demuxer); |