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/audio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'audio/audio.h') diff --git a/audio/audio.h b/audio/audio.h index a221b126ac..a0ecb2d7bf 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -35,7 +35,7 @@ struct mp_audio { int nch; // number of channels (redundant with chmap) int spf; // sub-samples per sample on each plane int num_planes; // number of planes - int bps; // size of sub-samples (af_fmt2bps(format)) + int bps; // size of sub-samples (af_fmt_to_bytes(format)) // --- private // These do not necessarily map directly to planes[]. They can have -- cgit v1.2.3