Unified · Split
| @@ -38,7 +38,9 @@ typedef struct FieldOrderContext { · 37 unmodified lines | |||
| 38 | int line_size[4]; ///< bytes of pixel data per line for each plane | 38 | int line_size[4]; ///< bytes of pixel data per line for each plane |
| 39 | } FieldOrderContext; | 39 | } FieldOrderContext; |
| 40 | 40 | ||
| 41 | static int query_formats(AVFilterContext *ctx) | 41 | static int query_formats(const AVFilterContext *ctx, |
| 42 | AVFilterFormatsConfig **cfg_in, | ||
| 43 | AVFilterFormatsConfig **cfg_out) | ||
| 42 | { | 44 | { |
| 43 | const AVPixFmtDescriptor *desc = NULL; | 45 | const AVPixFmtDescriptor *desc = NULL; |
| 44 | AVFilterFormats *formats; | 46 | AVFilterFormats *formats; |
| @@ -56,7 +58,7 @@ static int query_formats(AVFilterContext *ctx) · 11 unmodified lines | |||
| 56 | (ret = ff_add_format(&formats, pix_fmt)) < 0) | 58 | (ret = ff_add_format(&formats, pix_fmt)) < 0) |
| 57 | return ret; | 59 | return ret; |
| 58 | } | 60 | } |
| 59 | return ff_set_common_formats(ctx, formats); | 61 | return ff_set_common_formats2(ctx, cfg_in, cfg_out, formats); |
| 60 | } | 62 | } |
| 61 | 63 | ||
| 62 | static int config_input(AVFilterLink *inlink) | 64 | static int config_input(AVFilterLink *inlink) |
| @@ -183,6 +185,6 @@ const AVFilter ff_vf_fieldorder = { · 120 unmodified lines | |||
| 183 | .priv_class = &fieldorder_class, | 185 | .priv_class = &fieldorder_class, |
| 184 | FILTER_INPUTS(avfilter_vf_fieldorder_inputs), | 186 | FILTER_INPUTS(avfilter_vf_fieldorder_inputs), |
| 185 | FILTER_OUTPUTS(ff_video_default_filterpad), | 187 | FILTER_OUTPUTS(ff_video_default_filterpad), |
| 186 | FILTER_QUERY_FUNC(query_formats), | 188 | FILTER_QUERY_FUNC2(query_formats), |
| 187 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, | 189 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, |
| 188 | }; | 190 | }; |