Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -178,22 +178,24 @@ static av_cold void uninit(AVFilterContext *ctx) · 177 unmodified lines | ||
| 178 | 178 | av_freep(&sine->sin); |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | −static av_cold int query_formats(AVFilterContext *ctx) | |
| 181 | +static av_cold int query_formats(const AVFilterContext *ctx, | |
| 182 | + AVFilterFormatsConfig **cfg_in, | |
| 183 | + AVFilterFormatsConfig **cfg_out) | |
| 182 | 184 | { |
| 183 | − SineContext *sine = ctx->priv; | |
| 185 | + const SineContext *sine = ctx->priv; | |
| 184 | 186 | static const AVChannelLayout chlayouts[] = { AV_CHANNEL_LAYOUT_MONO, { 0 } }; |
| 185 | 187 | int sample_rates[] = { sine->sample_rate, -1 }; |
| 186 | 188 | static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, |
| 187 | 189 | AV_SAMPLE_FMT_NONE }; |
| 188 | − int ret = ff_set_common_formats_from_list(ctx, sample_fmts); | |
| 190 | + int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts); | |
| 189 | 191 | if (ret < 0) |
| 190 | 192 | return ret; |
| 191 | 193 | |
| 192 | − ret = ff_set_common_channel_layouts_from_list(ctx, chlayouts); | |
| 194 | + ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, chlayouts); | |
| 193 | 195 | if (ret < 0) |
| 194 | 196 | return ret; |
| 195 | 197 | |
| 196 | − return ff_set_common_samplerates_from_list(ctx, sample_rates); | |
| 198 | + return ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, sample_rates); | |
| 197 | 199 | } |
| 198 | 200 | |
| 199 | 201 | static av_cold int config_props(AVFilterLink *outlink) |
| @@ -271,6 +273,6 @@ const AVFilter ff_asrc_sine = { · 71 unmodified lines | ||
| 271 | 273 | .priv_size = sizeof(SineContext), |
| 272 | 274 | .inputs = NULL, |
| 273 | 275 | FILTER_OUTPUTS(sine_outputs), |
| 274 | − FILTER_QUERY_FUNC(query_formats), | |
| 276 | + FILTER_QUERY_FUNC2(query_formats), | |
| 275 | 277 | .priv_class = &sine_class, |
| 276 | 278 | }; |