Unified · Split
| @@ -41,17 +41,19 @@ static const AVOption showpalette_options[] = { · 40 unmodified lines | |||
| 41 | 41 | ||
| 42 | AVFILTER_DEFINE_CLASS(showpalette); | 42 | AVFILTER_DEFINE_CLASS(showpalette); |
| 43 | 43 | ||
| 44 | static int query_formats(AVFilterContext *ctx) | 44 | static int query_formats(const AVFilterContext *ctx, |
| 45 | AVFilterFormatsConfig **cfg_in, | ||
| 46 | AVFilterFormatsConfig **cfg_out) | ||
| 45 | { | 47 | { |
| 46 | static const enum AVPixelFormat in_fmts[] = {AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE}; | 48 | static const enum AVPixelFormat in_fmts[] = {AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE}; |
| 47 | static const enum AVPixelFormat out_fmts[] = {AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE}; | 49 | static const enum AVPixelFormat out_fmts[] = {AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE}; |
| 48 | int ret = ff_formats_ref(ff_make_format_list(in_fmts), | 50 | int ret = ff_formats_ref(ff_make_format_list(in_fmts), |
| 49 | &ctx->inputs[0]->outcfg.formats); | 51 | &cfg_in[0]->formats); |
| 50 | if (ret < 0) | 52 | if (ret < 0) |
| 51 | return ret; | 53 | return ret; |
| 52 | 54 | ||
| 53 | return ff_formats_ref(ff_make_format_list(out_fmts), | 55 | return ff_formats_ref(ff_make_format_list(out_fmts), |
| 54 | &ctx->outputs[0]->incfg.formats); | 56 | &cfg_out[0]->formats); |
| 55 | } | 57 | } |
| 56 | 58 | ||
| 57 | static int config_output(AVFilterLink *outlink) | 59 | static int config_output(AVFilterLink *outlink) |
| @@ -116,6 +118,6 @@ const AVFilter ff_vf_showpalette = { · 58 unmodified lines | |||
| 116 | .priv_size = sizeof(ShowPaletteContext), | 118 | .priv_size = sizeof(ShowPaletteContext), |
| 117 | FILTER_INPUTS(showpalette_inputs), | 119 | FILTER_INPUTS(showpalette_inputs), |
| 118 | FILTER_OUTPUTS(showpalette_outputs), | 120 | FILTER_OUTPUTS(showpalette_outputs), |
| 119 | FILTER_QUERY_FUNC(query_formats), | 121 | FILTER_QUERY_FUNC2(query_formats), |
| 120 | .priv_class = &showpalette_class, | 122 | .priv_class = &showpalette_class, |
| 121 | }; | 123 | }; |