Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'

[ffmpeg] / libavresample / audio_convert.c

diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c
index c3e9aa3da9b954a2fdec4be382fd89e49888f2a0..562903449e2abb8fd3136d2191d79b5e53f083fa 100644 (file)
--- 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;