From be9eb083894f207cd390bf7de77f762d754f9a7c Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 12 Nov 2014 20:19:21 +0100 Subject: af: remove redundant function --- audio/filter/af.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'audio/filter') diff --git a/audio/filter/af.c b/audio/filter/af.c index 1f57be5ff6..b93b703883 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -124,13 +124,6 @@ const struct m_obj_list af_obj_list = { }, }; -static bool af_config_equals(struct mp_audio *a, struct mp_audio *b) -{ - return a->format == b->format - && mp_chmap_equals(&a->channels, &b->channels) - && a->rate == b->rate; -} - static void af_copy_unset_fields(struct mp_audio *dst, struct mp_audio *src) { if (dst->format == AF_FORMAT_UNKNOWN) @@ -165,7 +158,7 @@ static int output_control(struct af_instance* af, int cmd, void* arg) *filter_output = *output; af_copy_unset_fields(filter_output, in); *in = *filter_output; - return af_config_equals(in, &orig_in) ? AF_OK : AF_FALSE; + return mp_audio_config_equals(in, &orig_in) ? AF_OK : AF_FALSE; } } return AF_UNKNOWN; @@ -575,7 +568,7 @@ static int af_reinit(struct af_stream *s) * insert new filters or change the input format, the output format won't * change. (Audio outputs generally can't change format at runtime.) */ af_copy_unset_fields(&s->output, &s->filter_output); - if (af_config_equals(&s->output, &s->filter_output)) { + if (mp_audio_config_equals(&s->output, &s->filter_output)) { s->initialized = 1; af_print_filter_chain(s, NULL, MSGL_V); return AF_OK; -- cgit v1.2.3