diff options
author | wm4 <wm4@nowhere> | 2015-05-08 21:14:23 +0200 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-05-09 21:14:35 +0900 |
commit | ba799895e14a662597a25a8ec349f889de465da5 (patch) | |
tree | a129a753d08936c9932b45cb14c520092c76d4a6 /audio | |
parent | 438ae9f742920a79f282433ec2df1904468f716c (diff) | |
download | mpv-ba799895e14a662597a25a8ec349f889de465da5.tar.bz2 mpv-ba799895e14a662597a25a8ec349f889de465da5.tar.xz |
audio: remove mp_chmap_contains()
It's unsued now.
(cherry picked from commit 8d5924f2c9c7d80b45cd68b44cb9c74e7b0b5a8c)
Diffstat (limited to 'audio')
-rw-r--r-- | audio/chmap.c | 10 | ||||
-rw-r--r-- | audio/chmap.h | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/audio/chmap.c b/audio/chmap.c index b48a42325f..4f76eedd59 100644 --- a/audio/chmap.c +++ b/audio/chmap.c @@ -417,16 +417,6 @@ int mp_chmap_diffn(const struct mp_chmap *a, const struct mp_chmap *b) return diff.num; } -// Checks whether a contains all the speakers in b -bool mp_chmap_contains(const struct mp_chmap *a, const struct mp_chmap *b) -{ - struct mp_chmap d1; - struct mp_chmap d2; - mp_chmap_diff(a, b, &d1); - mp_chmap_diff(b, a, &d2); - return a->num >= b->num && d1.num >= 0 && d2.num == 0; -} - // Returns something like "fl-fr-fc". If there's a standard layout in lavc // order, return that, e.g. "3.0" instead of "fl-fr-fc". // Unassigned but valid speakers get names like "sp28". diff --git a/audio/chmap.h b/audio/chmap.h index fb3c118bf2..c3826065ce 100644 --- a/audio/chmap.h +++ b/audio/chmap.h @@ -127,8 +127,6 @@ void mp_chmap_diff(const struct mp_chmap *a, const struct mp_chmap *b, struct mp_chmap *diff); int mp_chmap_diffn(const struct mp_chmap *a, const struct mp_chmap *b); -bool mp_chmap_contains(const struct mp_chmap *a, const struct mp_chmap *b); - char *mp_chmap_to_str_buf(char *buf, size_t buf_size, const struct mp_chmap *src); #define mp_chmap_to_str(m) mp_chmap_to_str_buf((char[64]){0}, 64, (m)) |