OSDN Git Service

lavfi/af_aresample: fix info log for unknown layouts.
authorNicolas George <nicolas.george@normalesup.org>
Tue, 26 Feb 2013 19:13:57 +0000 (20:13 +0100)
committerNicolas George <nicolas.george@normalesup.org>
Thu, 28 Feb 2013 18:23:12 +0000 (19:23 +0100)
libavfilter/af_aresample.c

index ab3e7cf..66a8a53 100644 (file)
@@ -165,8 +165,8 @@ static int config_output(AVFilterLink *outlink)
 
     aresample->ratio = (double)outlink->sample_rate / inlink->sample_rate;
 
-    av_get_channel_layout_string(inchl_buf,  sizeof(inchl_buf),  -1, inlink ->channel_layout);
-    av_get_channel_layout_string(outchl_buf, sizeof(outchl_buf), -1, outlink->channel_layout);
+    av_get_channel_layout_string(inchl_buf,  sizeof(inchl_buf),  inlink ->channels, inlink ->channel_layout);
+    av_get_channel_layout_string(outchl_buf, sizeof(outchl_buf), outlink->channels, outlink->channel_layout);
 
     av_log(ctx, AV_LOG_VERBOSE, "ch:%d chl:%s fmt:%s r:%dHz -> ch:%d chl:%s fmt:%s r:%dHz\n",
            inlink ->channels, inchl_buf,  av_get_sample_fmt_name(inlink->format),  inlink->sample_rate,