Merge commit '6f9e34baea4f6f484392e4e67f606a0835d07b73'

[ffmpeg] / libavfilter / af_ashowinfo.c

diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index ba600cbc6806eff896f6a2f87382b75840c06fd6..a81729f7f7f405a6b8df45afbbf1bba8440bfb9c 100644 (file)
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@@ -199,7 +199,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
                        s->plane_checksums[0];
     }
 
-    av_get_channel_layout_string(chlayout_str, sizeof(chlayout_str), -1,
+    av_get_channel_layout_string(chlayout_str, sizeof(chlayout_str), av_frame_get_channels(buf),
                                  buf->channel_layout);
 
     av_log(ctx, AV_LOG_INFO,