summaryrefslogtreecommitdiffstats
path: root/audio/filter/af_lavrresample.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-06-26 23:06:37 +0200
committerwm4 <wm4@nowhere>2015-06-26 23:06:37 +0200
commit6147bcce359358855ad02d8d5cbd6575d39b0449 (patch)
tree5cb8bafc418cd71b68f95766ad01b3312feed518 /audio/filter/af_lavrresample.c
parentd6737c5fab489964558b1eed934969c4f151912d (diff)
downloadmpv-6147bcce359358855ad02d8d5cbd6575d39b0449.tar.bz2
mpv-6147bcce359358855ad02d8d5cbd6575d39b0449.tar.xz
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".
Diffstat (limited to 'audio/filter/af_lavrresample.c')
-rw-r--r--audio/filter/af_lavrresample.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c
index f811dfaeb9..38fd84c901 100644
--- a/audio/filter/af_lavrresample.c
+++ b/audio/filter/af_lavrresample.c
@@ -497,7 +497,7 @@ static int filter(struct af_instance *af, struct mp_audio *in)
mp_audio_copy_config(out, &s->avrctx_fmt);
if (out->samples && !mp_audio_config_equals(out, &s->pre_out_fmt)) {
- assert(AF_FORMAT_IS_PLANAR(out->format) && out->format == real_out.format);
+ assert(af_fmt_is_planar(out->format) && out->format == real_out.format);
reorder_planes(out, s->reorder_out, &s->pool_fmt.channels);
if (!mp_audio_config_equals(out, &s->pre_out_fmt)) {
struct mp_audio *new = mp_audio_pool_get(s->reorder_buffer,