[FFmpeg-cvslog] lavfi/af_amerge: set outbuf->audio->channels.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Thu Jan 31 14:26:15 2013 +0100| [dcce43340f454626c0462ec18fa911dc8280a8c2] | committer: Nicolas George

lavfi/af_amerge: set outbuf->audio->channels.

The value is lost because of avfilter_copy_buffer_ref_props().

Fix trac ticket #2217.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcce43340f454626c0462ec18fa911dc8280a8c2
---

 libavfilter/af_amerge.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index e552682..f67a7a8 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;