diff options
| author | Kevin Mitchell <kevmitch@gmail.com> | 2015-04-02 22:01:51 -0700 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2015-04-03 15:40:01 -0700 |
| commit | 46b9df9f9e1eec5cdaa03ab842b34cf1f2ad9ece (patch) | |
| tree | eae7a659723e84dc6382cc4a011aa1809342c97c /audio/out/ao_lavc.c | |
| parent | 07671ac57b41710201e9a0f22b8a8d0febad1c37 (diff) | |
| download | mpv-46b9df9f9e1eec5cdaa03ab842b34cf1f2ad9ece.tar.bz2 mpv-46b9df9f9e1eec5cdaa03ab842b34cf1f2ad9ece.tar.xz | |
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
Diffstat (limited to 'audio/out/ao_lavc.c')
| -rw-r--r-- | audio/out/ao_lavc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index 2405b2213a..f61401a49e 100644 --- a/audio/out/ao_lavc.c +++ b/audio/out/ao_lavc.c @@ -242,7 +242,7 @@ static int encode(struct ao *ao, double apts, void **data) frame->format = af_to_avformat(ao->format); frame->nb_samples = ac->aframesize; - size_t num_planes = af_fmt_is_planar(ao->format) ? ao->channels.num : 1; + size_t num_planes = AF_FORMAT_IS_PLANAR(ao->format) ? ao->channels.num : 1; assert(num_planes <= AV_NUM_DATA_POINTERS); for (int n = 0; n < num_planes; n++) frame->extended_data[n] = data[n]; @@ -351,7 +351,7 @@ static int play(struct ao *ao, void **data, int samples, int flags) double pts = ectx->last_audio_in_pts; pts += ectx->samples_since_last_pts / (double)ao->samplerate; - size_t num_planes = af_fmt_is_planar(ao->format) ? ao->channels.num : 1; + size_t num_planes = AF_FORMAT_IS_PLANAR(ao->format) ? ao->channels.num : 1; void *tempdata = NULL; void *padded[MP_NUM_CHANNELS]; |