[SCM] libav/experimental: lavr: Update the planar check in ff_audio_convert

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 11db644a8e54f02e54d2eaad343a87fcb697c15e
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Sun Aug 17 13:28:03 2014 +0000

    lavr: Update the planar check in ff_audio_convert
    
    Leftover from fbc0b8659967ea54a8472b5f795270d38bb085dd.
    
    Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c
index 11bbbbe..ef23912 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;
 

-- 
Libav/FFmpeg packaging