diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-02-28 23:31:51 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-02-28 23:31:51 +0100 |
| commit | 21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979 (patch) | |
| tree | b9679cc1d2c7c3cab0f88c370015f34f6d0b27ca /stream/dvb_tune.h | |
| parent | d1d6257731866934717353fce484f5f472f845d1 (diff) | |
| parent | 1f436f65f2ee4df6419ca68bd6426b8283db6d22 (diff) | |
| download | mpv-21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979.tar.bz2 mpv-21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'stream/dvb_tune.h')
| -rw-r--r-- | stream/dvb_tune.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/dvb_tune.h b/stream/dvb_tune.h index 50c598f810..dafa1175bd 100644 --- a/stream/dvb_tune.h +++ b/stream/dvb_tune.h @@ -23,7 +23,7 @@ struct mp_log; -int dvb_get_tuner_type(int fe_fd, struct mp_log *log); +int dvb_get_tuner_types(int fe_fd, struct mp_log *log, int** tuner_types); int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt); int dvb_fix_demuxes(dvb_priv_t *priv, int cnt); int dvb_set_ts_filt(dvb_priv_t *priv, int fd, uint16_t pid, dmx_pes_type_t pestype); |