summaryrefslogtreecommitdiff
path: root/libavresample
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-08-17 13:28:03 +0000
committerLuca Barbato <lu_zero@gentoo.org>2014-08-17 16:11:02 +0200
commit11db644a8e54f02e54d2eaad343a87fcb697c15e (patch)
treec09f29f05d427bf3577c876228c1c9802c5e5a51 /libavresample
parent96ce6d6f119a16e489941c629a2805204322b717 (diff)
lavr: Update the planar check in ff_audio_convert
Leftover from fbc0b8659967ea54a8472b5f795270d38bb085dd. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/audio_convert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c
index 11bbbbee49..ef23912a3b 100644
--- a/libavresample/audio_convert.c
+++ b/libavresample/audio_convert.c
@@ -345,13 +345,13 @@ int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in)
if (ac->apply_map) {
ChannelMapInfo *map = &ac->avr->ch_map_info;
- if (!av_sample_fmt_is_planar(ac->out_fmt)) {
+ if (!ff_sample_fmt_is_planar(ac->out_fmt, ac->channels)) {
av_log(ac->avr, AV_LOG_ERROR, "cannot remap packed format during conversion\n");
return AVERROR(EINVAL);
}
if (map->do_remap) {
- if (av_sample_fmt_is_planar(ac->in_fmt)) {
+ if (ff_sample_fmt_is_planar(ac->in_fmt, ac->channels)) {
conv_func_flat *convert = use_generic ? ac->conv_flat_generic :
ac->conv_flat;