Unified · Split
| @@ -183,9 +183,11 @@ static av_cold int init(AVFilterContext *ctx) · 182 unmodified lines | ||
| 183 | 183 | |
| 184 | 184 | static enum AVColorRange convert_range_from_zimg(enum zimg_pixel_range_e color_range); |
| 185 | 185 | |
| 186 | −static int query_formats(AVFilterContext *ctx) | |
| 186 | +static int query_formats(const AVFilterContext *ctx, | |
| 187 | + AVFilterFormatsConfig **cfg_in, | |
| 188 | + AVFilterFormatsConfig **cfg_out) | |
| 187 | 189 | { |
| 188 | − ZScaleContext *s = ctx->priv; | |
| 190 | + const ZScaleContext *s = ctx->priv; | |
| 189 | 191 | AVFilterFormats *formats; |
| 190 | 192 | static const enum AVPixelFormat pixel_fmts[] = { |
| 191 | 193 | AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, |
| @@ -212,27 +214,27 @@ static int query_formats(AVFilterContext *ctx) · 20 unmodified lines | ||
| 212 | 214 | }; |
| 213 | 215 | int ret; |
| 214 | 216 | |
| 215 | − ret = ff_formats_ref(ff_make_format_list(pixel_fmts), &ctx->inputs[0]->outcfg.formats); | |
| 217 | + ret = ff_formats_ref(ff_make_format_list(pixel_fmts), &cfg_in[0]->formats); | |
| 216 | 218 | if (ret < 0) |
| 217 | 219 | return ret; |
| 218 | − ret = ff_formats_ref(ff_make_format_list(pixel_fmts), &ctx->outputs[0]->incfg.formats); | |
| 220 | + ret = ff_formats_ref(ff_make_format_list(pixel_fmts), &cfg_out[0]->formats); | |
| 219 | 221 | if (ret < 0) |
| 220 | 222 | return ret; |
| 221 | 223 | |
| 222 | − if ((ret = ff_formats_ref(ff_all_color_spaces(), &ctx->inputs[0]->outcfg.color_spaces)) < 0 || | |
| 223 | − (ret = ff_formats_ref(ff_all_color_ranges(), &ctx->inputs[0]->outcfg.color_ranges)) < 0) | |
| 224 | + if ((ret = ff_formats_ref(ff_all_color_spaces(), &cfg_in[0]->color_spaces)) < 0 || | |
| 225 | + (ret = ff_formats_ref(ff_all_color_ranges(), &cfg_in[0]->color_ranges)) < 0) | |
| 224 | 226 | return ret; |
| 225 | 227 | |
| 226 | 228 | formats = s->colorspace != ZIMG_MATRIX_UNSPECIFIED && s->colorspace > 0 |
| 227 | 229 | ? ff_make_formats_list_singleton(s->colorspace) |
| 228 | 230 | : ff_all_color_spaces(); |
| 229 | − if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.color_spaces)) < 0) | |
| 231 | + if ((ret = ff_formats_ref(formats, &cfg_out[0]->color_spaces)) < 0) | |
| 230 | 232 | return ret; |
| 231 | 233 | |
| 232 | 234 | formats = s->range != -1 |
| 233 | 235 | ? ff_make_formats_list_singleton(convert_range_from_zimg(s->range)) |
| 234 | 236 | : ff_all_color_ranges(); |
| 235 | − if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.color_ranges)) < 0) | |
| 237 | + if ((ret = ff_formats_ref(formats, &cfg_out[0]->color_ranges)) < 0) | |
| 236 | 238 | return ret; |
| 237 | 239 | |
| 238 | 240 | return 0; |
| @@ -1133,7 +1135,7 @@ const AVFilter ff_vf_zscale = { · 894 unmodified lines | ||
| 1133 | 1135 | .uninit = uninit, |
| 1134 | 1136 | FILTER_INPUTS(avfilter_vf_zscale_inputs), |
| 1135 | 1137 | FILTER_OUTPUTS(avfilter_vf_zscale_outputs), |
| 1136 | − FILTER_QUERY_FUNC(query_formats), | |
| 1138 | + FILTER_QUERY_FUNC2(query_formats), | |
| 1137 | 1139 | .process_command = process_command, |
| 1138 | 1140 | .flags = AVFILTER_FLAG_SLICE_THREADS, |
| 1139 | 1141 | }; |