Unified · Split
| @@ -63,9 +63,11 @@ static const AVOption options[] = { · 62 unmodified lines | |||
| 63 | 63 | ||
| 64 | AVFILTER_DEFINE_CLASS_EXT(premultiply, "(un)premultiply", options); | 64 | AVFILTER_DEFINE_CLASS_EXT(premultiply, "(un)premultiply", options); |
| 65 | 65 | ||
| 66 | static int query_formats(AVFilterContext *ctx) | 66 | static int query_formats(const AVFilterContext *ctx, |
| 67 | AVFilterFormatsConfig **cfg_in, | ||
| 68 | AVFilterFormatsConfig **cfg_out) | ||
| 67 | { | 69 | { |
| 68 | PreMultiplyContext *s = ctx->priv; | 70 | const PreMultiplyContext *s = ctx->priv; |
| 69 | 71 | ||
| 70 | static const enum AVPixelFormat no_alpha_pix_fmts[] = { | 72 | static const enum AVPixelFormat no_alpha_pix_fmts[] = { |
| 71 | AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, | 73 | AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, |
| @@ -86,7 +88,8 @@ static int query_formats(AVFilterContext *ctx) · 14 unmodified lines | |||
| 86 | AV_PIX_FMT_NONE | 88 | AV_PIX_FMT_NONE |
| 87 | }; | 89 | }; |
| 88 | 90 | ||
| 89 | return ff_set_common_formats_from_list(ctx, s->inplace ? alpha_pix_fmts : no_alpha_pix_fmts); | 91 | return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, |
| 92 | s->inplace ? alpha_pix_fmts : no_alpha_pix_fmts); | ||
| 90 | } | 93 | } |
| 91 | 94 | ||
| 92 | static void premultiply8(const uint8_t *msrc, const uint8_t *asrc, | 95 | static void premultiply8(const uint8_t *msrc, const uint8_t *asrc, |
| @@ -830,7 +833,7 @@ const AVFilter ff_vf_premultiply = { · 737 unmodified lines | |||
| 830 | .activate = activate, | 833 | .activate = activate, |
| 831 | .inputs = NULL, | 834 | .inputs = NULL, |
| 832 | FILTER_OUTPUTS(premultiply_outputs), | 835 | FILTER_OUTPUTS(premultiply_outputs), |
| 833 | FILTER_QUERY_FUNC(query_formats), | 836 | FILTER_QUERY_FUNC2(query_formats), |
| 834 | .priv_class = &premultiply_class, | 837 | .priv_class = &premultiply_class, |
| 835 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | | 838 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | |
| 836 | AVFILTER_FLAG_DYNAMIC_INPUTS | | 839 | AVFILTER_FLAG_DYNAMIC_INPUTS | |
| @@ -851,7 +854,7 @@ const AVFilter ff_vf_unpremultiply = { · 14 unmodified lines | |||
| 851 | .activate = activate, | 854 | .activate = activate, |
| 852 | .inputs = NULL, | 855 | .inputs = NULL, |
| 853 | FILTER_OUTPUTS(premultiply_outputs), | 856 | FILTER_OUTPUTS(premultiply_outputs), |
| 854 | FILTER_QUERY_FUNC(query_formats), | 857 | FILTER_QUERY_FUNC2(query_formats), |
| 855 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | | 858 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | |
| 856 | AVFILTER_FLAG_DYNAMIC_INPUTS | | 859 | AVFILTER_FLAG_DYNAMIC_INPUTS | |
| 857 | AVFILTER_FLAG_SLICE_THREADS, | 860 | AVFILTER_FLAG_SLICE_THREADS, |