From 6147bcce359358855ad02d8d5cbd6575d39b0449 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 26 Jun 2015 23:06:37 +0200 Subject: audio: fix format function consistency issues Replace all the check macros with function calls. Give them all the same case and naming schema. Drop af_fmt2bits(). Only af_fmt2bps() survives as af_fmt_to_bytes(). Introduce af_fmt_is_pcm(), and use it in situations that used !AF_FORMAT_IS_SPECIAL. Nobody really knew what a "special" format was. It simply meant "not PCM". --- audio/filter/af.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'audio/filter/af.c') diff --git a/audio/filter/af.c b/audio/filter/af.c index 3e7fdf045a..f37a47697e 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -493,8 +493,8 @@ static int af_reinit(struct af_stream *s) int fmt_in1 = af->prev->data->format; int fmt_in2 = in.format; if (af_fmt_is_valid(fmt_in1) && af_fmt_is_valid(fmt_in2)) { - bool spd1 = AF_FORMAT_IS_IEC61937(fmt_in1); - bool spd2 = AF_FORMAT_IS_IEC61937(fmt_in2); + bool spd1 = af_fmt_is_spdif(fmt_in1); + bool spd2 = af_fmt_is_spdif(fmt_in2); if (spd1 != spd2 && af->next) { MP_WARN(af, "Filter %s apparently cannot be used due to " "spdif passthrough - removing it.\n", -- cgit v1.2.3