Also, drop redundant calls that also happen implicitly in generic code.
Unified · Split
| @@ -116,32 +116,23 @@ static const AVOption showfreqs_options[] = { · 115 unmodified lines | |||
| 116 | 116 | ||
| 117 | AVFILTER_DEFINE_CLASS(showfreqs); | 117 | AVFILTER_DEFINE_CLASS(showfreqs); |
| 118 | 118 | ||
| 119 | static int query_formats(AVFilterContext *ctx) | 119 | static int query_formats(const AVFilterContext *ctx, |
| 120 | AVFilterFormatsConfig **cfg_in, | ||
| 121 | AVFilterFormatsConfig **cfg_out) | ||
| 120 | { | 122 | { |
| 121 | AVFilterFormats *formats = NULL; | 123 | AVFilterFormats *formats = NULL; |
| 122 | AVFilterChannelLayouts *layouts = NULL; | ||
| 123 | AVFilterLink *inlink = ctx->inputs[0]; | ||
| 124 | AVFilterLink *outlink = ctx->outputs[0]; | ||
| 125 | static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }; | 124 | static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }; |
| 126 | static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_NONE }; | 125 | static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_NONE }; |
| 127 | int ret; | 126 | int ret; |
| 128 | 127 | ||
| 129 | /* set input audio formats */ | 128 | /* set input audio formats */ |
| 130 | formats = ff_make_format_list(sample_fmts); | 129 | formats = ff_make_format_list(sample_fmts); |
| 131 | if ((ret = ff_formats_ref(formats, &inlink->outcfg.formats)) < 0) | 130 | if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0) |
| 132 | return ret; | ||
| 133 | |||
| 134 | layouts = ff_all_channel_counts(); | ||
| 135 | if ((ret = ff_channel_layouts_ref(layouts, &inlink->outcfg.channel_layouts)) < 0) | ||
| 136 | return ret; | ||
| 137 | |||
| 138 | formats = ff_all_samplerates(); | ||
| 139 | if ((ret = ff_formats_ref(formats, &inlink->outcfg.samplerates)) < 0) | ||
| 140 | return ret; | 131 | return ret; |
| 141 | 132 | ||
| 142 | /* set output video format */ | 133 | /* set output video format */ |
| 143 | formats = ff_make_format_list(pix_fmts); | 134 | formats = ff_make_format_list(pix_fmts); |
| 144 | if ((ret = ff_formats_ref(formats, &outlink->incfg.formats)) < 0) | 135 | if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0) |
| 145 | return ret; | 136 | return ret; |
| 146 | 137 | ||
| 147 | return 0; | 138 | return 0; |
| @@ -566,6 +557,6 @@ const AVFilter ff_avf_showfreqs = { · 418 unmodified lines | |||
| 566 | .activate = activate, | 557 | .activate = activate, |
| 567 | FILTER_INPUTS(ff_audio_default_filterpad), | 558 | FILTER_INPUTS(ff_audio_default_filterpad), |
| 568 | FILTER_OUTPUTS(showfreqs_outputs), | 559 | FILTER_OUTPUTS(showfreqs_outputs), |
| 569 | FILTER_QUERY_FUNC(query_formats), | 560 | FILTER_QUERY_FUNC2(query_formats), |
| 570 | .priv_class = &showfreqs_class, | 561 | .priv_class = &showfreqs_class, |
| 571 | }; | 562 | }; |