From 46b9df9f9e1eec5cdaa03ab842b34cf1f2ad9ece Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Thu, 2 Apr 2015 22:01:51 -0700 Subject: audio: make all format query shortcuts macros af_fmt_is_float and af_fmt_is_planar were previously inconsistent with AF_FORAMT_IS_SPECIAL/AF_FORMAT_IS_IEC61937 --- audio/filter/af_lavrresample.c | 2 +- audio/filter/af_volume.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'audio/filter') diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index 7ccfc5c593..9e4a8adaaa 100644 --- a/audio/filter/af_lavrresample.c +++ b/audio/filter/af_lavrresample.c @@ -404,7 +404,7 @@ static int filter(struct af_instance *af, struct mp_audio *in) } if (needs_reorder(s->reorder_out, out->nch)) { - if (af_fmt_is_planar(out->format)) { + if (AF_FORMAT_IS_PLANAR(out->format)) { reorder_planes(out, s->reorder_out); } else if (out->samples) { struct mp_audio *new = mp_audio_pool_get(s->reorder_buffer, out, diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c index 0a3264e409..89a18e9d39 100644 --- a/audio/filter/af_volume.c +++ b/audio/filter/af_volume.c @@ -59,7 +59,7 @@ static int control(struct af_instance *af, int cmd, void *arg) } else { mp_audio_set_format(af->data, AF_FORMAT_FLOAT); } - if (af_fmt_is_planar(in->format)) + if (AF_FORMAT_IS_PLANAR(in->format)) mp_audio_set_format(af->data, af_fmt_to_planar(af->data->format)); s->rgain = 1.0; if ((s->rgain_track || s->rgain_album) && af->replaygain_data) { -- cgit v1.2.3