diff options
author | wm4 <wm4@nowhere> | 2015-02-20 21:21:14 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-02-20 21:21:14 +0100 |
commit | 6aa6778ac46672dd237acc86856353d133917f06 (patch) | |
tree | d7e19e4c35ea99193b826fcd78e975c1bc376f62 /demux/demux.h | |
parent | 6c1355be967751b194504ed73b053846fbae5fa9 (diff) | |
download | mpv-6aa6778ac46672dd237acc86856353d133917f06.tar.bz2 mpv-6aa6778ac46672dd237acc86856353d133917f06.tar.xz |
demux: change demux_open() signature
Fold the relatively obscure force_format parameter into demuxer_params.
Diffstat (limited to 'demux/demux.h')
-rw-r--r-- | demux/demux.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux.h b/demux/demux.h index 848c7701f0..b76fb8fedc 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -166,6 +166,7 @@ typedef struct demux_attachment } demux_attachment_t; struct demuxer_params { + char *force_format; int matroska_num_wanted_uids; struct matroska_segment_uid *matroska_wanted_uids; int matroska_wanted_segment; @@ -255,8 +256,7 @@ struct demux_packet *demux_read_any_packet(struct demuxer *demuxer); struct sh_stream *new_sh_stream(struct demuxer *demuxer, enum stream_type type); -struct demuxer *demux_open(struct stream *stream, char *force_format, - struct demuxer_params *params, +struct demuxer *demux_open(struct stream *stream, struct demuxer_params *params, struct mpv_global *global); void demux_start_thread(struct demuxer *demuxer); |