From dcce43340f454626c0462ec18fa911dc8280a8c2 Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Thu, 31 Jan 2013 14:26:15 +0100
Subject: [PATCH] lavfi/af_amerge: set outbuf->audio->channels.

The value is lost because of avfilter_copy_buffer_ref_props().

Fix trac ticket #2217.
---
 libavfilter/af_amerge.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index e55268259e..f67a7a8c1b 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -260,6 +260,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *insamples)
 
     outbuf->audio->nb_samples     = nb_samples;
     outbuf->audio->channel_layout = outlink->channel_layout;
+    outbuf->audio->channels       = outlink->channels;
 
     while (nb_samples) {
         ns = nb_samples;