From: Michael Niedermayer Date: Wed, 19 Sep 2012 20:19:06 +0000 (+0200) Subject: bavfilter/filtfmts: fix type for channel layouts X-Git-Tag: android-x86-4.4-r1~9406 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f5326dc68e802495980241ff9c38a635a3926e11;p=android-x86%2Fexternal-ffmpeg.git bavfilter/filtfmts: fix type for channel layouts Signed-off-by: Michael Niedermayer --- diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts.c index f47bf38c5a..3a3bde6435 100644 --- a/libavfilter/filtfmts.c +++ b/libavfilter/filtfmts.c @@ -45,6 +45,7 @@ static void print_formats(AVFilterContext *filter_ctx) av_get_pix_fmt_name(fmts->formats[j])); \ } else if (filter_ctx->inout##puts[i]->type == AVMEDIA_TYPE_AUDIO) { \ AVFilterFormats *fmts; \ + AVFilterChannelLayouts *layouts; \ \ fmts = filter_ctx->inout##puts[i]->outin##_formats; \ for (j = 0; j < fmts->format_count; j++) \ @@ -52,11 +53,11 @@ static void print_formats(AVFilterContext *filter_ctx) i, filter_ctx->filter->inout##puts[i].name, \ av_get_sample_fmt_name(fmts->formats[j])); \ \ - fmts = filter_ctx->inout##puts[i]->outin##_channel_layouts; \ - for (j = 0; j < fmts->format_count; j++) { \ + layouts = filter_ctx->inout##puts[i]->outin##_channel_layouts; \ + for (j = 0; j < layouts->nb_channel_layouts; j++) { \ char buf[256]; \ av_get_channel_layout_string(buf, sizeof(buf), -1, \ - fmts->formats[j]); \ + layouts->channel_layouts[j]); \ printf(#INOUT "PUT[%d] %s: chlayout:%s\n", \ i, filter_ctx->filter->inout##puts[i].name, buf); \ } \