diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2015-11-10 18:45:08 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2015-11-10 18:45:08 +0100 |
| commit | 273607c1c6f77859e9a0cb98c3e4c74bc354fd8d (patch) | |
| tree | 0fbd329857356bddf1d4dfbcf09ca4fbe2d6f0f9 /audio/chmap_sel.h | |
| parent | 5b7d0fbab31cb70d05bb7f757283c1ee4028b091 (diff) | |
| parent | fee45c01703ace0d6af7b8fe60d151be245a0e3f (diff) | |
| download | mpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.bz2 mpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/chmap_sel.h')
| -rw-r--r-- | audio/chmap_sel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/audio/chmap_sel.h b/audio/chmap_sel.h index 786f06f239..12ded3b466 100644 --- a/audio/chmap_sel.h +++ b/audio/chmap_sel.h @@ -37,7 +37,6 @@ struct mp_chmap_sel { void mp_chmap_sel_add_any(struct mp_chmap_sel *s); void mp_chmap_sel_add_waveext(struct mp_chmap_sel *s); void mp_chmap_sel_add_waveext_def(struct mp_chmap_sel *s); -void mp_chmap_sel_add_alsa_def(struct mp_chmap_sel *s); void mp_chmap_sel_add_map(struct mp_chmap_sel *s, const struct mp_chmap *map); void mp_chmap_sel_add_speaker(struct mp_chmap_sel *s, int id); bool mp_chmap_sel_adjust(const struct mp_chmap_sel *s, struct mp_chmap *map); |