Also, drop redundant calls that also happen implicitly in generic code.
Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -155,32 +155,23 @@ static av_cold void uninit(AVFilterContext *ctx) · 154 unmodified lines | |||
| 155 | } | 155 | } |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | static int query_formats(AVFilterContext *ctx) | 158 | static int query_formats(const AVFilterContext *ctx, |
| 159 | AVFilterFormatsConfig **cfg_in, | ||
| 160 | AVFilterFormatsConfig **cfg_out) | ||
| 159 | { | 161 | { |
| 160 | AVFilterFormats *formats = NULL; | 162 | AVFilterFormats *formats = NULL; |
| 161 | AVFilterChannelLayouts *layouts = NULL; | ||
| 162 | AVFilterLink *inlink = ctx->inputs[0]; | ||
| 163 | AVFilterLink *outlink = ctx->outputs[0]; | ||
| 164 | static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }; | 163 | static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }; |
| 165 | static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; | 164 | static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; |
| 166 | int ret; | 165 | int ret; |
| 167 | 166 | ||
| 168 | /* set input audio formats */ | 167 | /* set input audio formats */ |
| 169 | formats = ff_make_format_list(sample_fmts); | 168 | formats = ff_make_format_list(sample_fmts); |
| 170 | if ((ret = ff_formats_ref(formats, &inlink->outcfg.formats)) < 0) | 169 | if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0) |
| 171 | return ret; | ||
| 172 | |||
| 173 | layouts = ff_all_channel_layouts(); | ||
| 174 | if ((ret = ff_channel_layouts_ref(layouts, &inlink->outcfg.channel_layouts)) < 0) | ||
| 175 | return ret; | ||
| 176 | |||
| 177 | formats = ff_all_samplerates(); | ||
| 178 | if ((ret = ff_formats_ref(formats, &inlink->outcfg.samplerates)) < 0) | ||
| 179 | return ret; | 170 | return ret; |
| 180 | 171 | ||
| 181 | /* set output video format */ | 172 | /* set output video format */ |
| 182 | formats = ff_make_format_list(pix_fmts); | 173 | formats = ff_make_format_list(pix_fmts); |
| 183 | if ((ret = ff_formats_ref(formats, &outlink->incfg.formats)) < 0) | 174 | if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0) |
| 184 | return ret; | 175 | return ret; |
| 185 | 176 | ||
| 186 | return 0; | 177 | return 0; |
| @@ -814,7 +805,7 @@ const AVFilter ff_avf_showwaves = { · 627 unmodified lines | |||
| 814 | FILTER_INPUTS(ff_audio_default_filterpad), | 805 | FILTER_INPUTS(ff_audio_default_filterpad), |
| 815 | .activate = activate, | 806 | .activate = activate, |
| 816 | FILTER_OUTPUTS(showwaves_outputs), | 807 | FILTER_OUTPUTS(showwaves_outputs), |
| 817 | FILTER_QUERY_FUNC(query_formats), | 808 | FILTER_QUERY_FUNC2(query_formats), |
| 818 | .priv_class = &showwaves_class, | 809 | .priv_class = &showwaves_class, |
| 819 | }; | 810 | }; |
| 820 | 811 | ||
| @@ -925,7 +916,7 @@ const AVFilter ff_avf_showwavespic = { · 104 unmodified lines | |||
| 925 | .priv_size = sizeof(ShowWavesContext), | 916 | .priv_size = sizeof(ShowWavesContext), |
| 926 | FILTER_INPUTS(showwavespic_inputs), | 917 | FILTER_INPUTS(showwavespic_inputs), |
| 927 | FILTER_OUTPUTS(showwavespic_outputs), | 918 | FILTER_OUTPUTS(showwavespic_outputs), |
| 928 | FILTER_QUERY_FUNC(query_formats), | 919 | FILTER_QUERY_FUNC2(query_formats), |
| 929 | .priv_class = &showwavespic_class, | 920 | .priv_class = &showwavespic_class, |
| 930 | }; | 921 | }; |
| 931 | 922 | ||