[SCM] libav/experimental: af_channelmap: Set the frame channel layout

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f0e959481968b6d906931127237ed981b6414f6e
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Fri Aug 1 23:32:40 2014 +0200

    af_channelmap: Set the frame channel layout
    
    Otherwise the frame would show the first layout matching the
    channel count.

diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index 3e5cc3d..3035405 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -342,6 +342,8 @@ static int channelmap_filter_frame(AVFilterLink *inlink, AVFrame *buf)
         memcpy(buf->data, buf->extended_data,
            FFMIN(FF_ARRAY_ELEMS(buf->data), nch_out) * sizeof(buf->data[0]));
 
+    buf->channel_layout = outlink->channel_layout;
+
     return ff_filter_frame(outlink, buf);
 }
 

-- 
Libav/FFmpeg packaging