aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-01-31 14:26:15 +0100
committerNicolas George <nicolas.george@normalesup.org>2013-01-31 21:03:54 +0100
commitdcce43340f454626c0462ec18fa911dc8280a8c2 (patch)
treeb03e5b9d863ba9918c295f4854c5c9b8ec154176 /libavfilter
parentae14887ee7f2a2c02957845b84afd711cf702b9b (diff)
downloadffmpeg-dcce43340f454626c0462ec18fa911dc8280a8c2.tar.gz
lavfi/af_amerge: set outbuf->audio->channels.
The value is lost because of avfilter_copy_buffer_ref_props(). Fix trac ticket #2217.
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_amerge.c1
1 files changed, 1 insertions, 0 deletions
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;