Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'

* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e':
  lavr: Update the planar check in ff_audio_convert

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --combined libavresample/audio_convert.c
index c3e9aa3da9b954a2fdec4be382fd89e49888f2a0,ef23912a3b2d454bdb18e75e920ab58cbc384602..562903449e2abb8fd3136d2191d79b5e53f083fa
--- 1/libavresample/audio_convert.c
--- 2/libavresample/audio_convert.c
+++ b/libavresample/audio_convert.c
@@@ -2,20 -2,20 +2,20 @@@
   * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
   * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -345,13 -345,13 +345,13 @@@ int ff_audio_convert(AudioConvert *ac, 
      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;