diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2015-09-23 01:12:42 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2015-09-23 01:12:42 +0200 |
| commit | ead2933792d6ad958c8ac2d50a0169c3c093ff2b (patch) | |
| tree | 682e71897c514d537df387e30dc758b8e1bae044 /audio/audio.h | |
| parent | 181e1377b24498f1a335a5eeecf46907edae092a (diff) | |
| parent | 79f8ee2808ebdf100d1a3aba9a853f801698a2ad (diff) | |
| download | mpv-ead2933792d6ad958c8ac2d50a0169c3c093ff2b.tar.bz2 mpv-ead2933792d6ad958c8ac2d50a0169c3c093ff2b.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/audio.h')
| -rw-r--r-- | audio/audio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/audio/audio.h b/audio/audio.h index a0ecb2d7bf..bf5358274a 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -46,7 +46,6 @@ struct mp_audio { void mp_audio_set_format(struct mp_audio *mpa, int format); void mp_audio_set_num_channels(struct mp_audio *mpa, int num_channels); -void mp_audio_set_channels_old(struct mp_audio *mpa, int num_channels); void mp_audio_set_channels(struct mp_audio *mpa, const struct mp_chmap *chmap); void mp_audio_copy_config(struct mp_audio *dst, const struct mp_audio *src); bool mp_audio_config_equals(const struct mp_audio *a, const struct mp_audio *b); |