diff options
| author | wm4 <wm4@nowhere> | 2015-06-26 23:06:37 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-06-26 23:06:37 +0200 |
| commit | 6147bcce359358855ad02d8d5cbd6575d39b0449 (patch) | |
| tree | 5cb8bafc418cd71b68f95766ad01b3312feed518 /audio/filter/af.c | |
| parent | d6737c5fab489964558b1eed934969c4f151912d (diff) | |
| download | mpv-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.c')
| -rw-r--r-- | audio/filter/af.c | 4 |
1 files changed, 2 insertions, 2 deletions
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", |